Merge branch 'dev/engine-ashley' of code.stanford.edu:plevis/ee185 into dev/pal