Merge pull request #34 from spotfinder/grace

Made a second master layout
Merge pull request #35 from spotfinder/grace

Fixed page jump on spot finder logo
added the reset password function
Merge pull request #36 from spotfinder/karina

added the reset password function
changed the route to index
Merge pull request #37 from spotfinder/karina

changed the route to index
created the reservation model and reservation controller
changing local time zone, added error 404 page, etc
Merge pull request #38 from spotfinder/karina

changing local time zone, added error 404 page, etc
merged marina's master pull
Continued work on the reservation controller, added notes for team to review the planned logic
entered a space between sections just to create a refreshed file; this file did not merge properly when merging personal branch with master branch
Just added a space to try and get this file to merge from a previous review

No changes to file
Merge pull request #39 from spotfinder/mike

continued work on the reservation controller - added notes for development team review
Test to sync with github

No actual change.