Merge pull request #17 from wschorn/wednesday_updates

Wednesday updates
Merge pull request #18 from wschorn/chaunces

Chaunces
Reindent app.js
timing