addition of user routes
Merge branch 'master' of https://github.com/FPennApps2013/nth-glass-331
Merge branch 'master' of https://github.com/FPennApps2013/nth-glass-331
change of image
merged changes from nick and mine, also added a .gitignore