Added user models and commented out sass and coffeescript gems. Also added bcript.
added controllers for Users and Logins.
Added views and Login protical.
Corrected a typo.
"added some controllers"
Fixed merge file issues.
did some stuff.