added rspec and first round of model tests for user model
Merge branch 'shawn' Added testing to master branch.
broken code
bugfixes to routes
Merge branch 'master' into nick

add rspec
fix appearance of modals
fix login/sign modals