fix conflicts
Merge branch 'master' of https://github.com/ospreys-2014/Kendrick
fixed jquery on signup and login clicks
fixed routes
fixed
Merge pull request #52 from ospreys-2014/user_branch

User branch