fixed something in app.js but not a big deal
fixed a few things with the modals
Merge branch 'mergetest' into kyle
added user login and session login via rails only.  Can create new user  via modal in nav bar, but modal cancel button doesn't work yet.
commit
login and sign up are working in nav bar
added ryan's work with authentication
Merge branch 'master' into kyle
added feature that removed the buttons when logged in
add factory_girl_rails gem
fix merge conflicts
Merge branch 'kyle'
create factories directory and user_factory.rb
trying heroku
Merge branch 'kyle'
Merge branch 'master' into cosimo
add user validation