add bcrypt to gem file, and password authenticate
fix routing for new user signup, add bcrypt for password
resolving routing problems, and conflicts
Merge branch 'avi'

merging avi into master, resolved apparent conflicts