Merge pull request #95 from nealfennimore/master

Merge conflict on js
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog