added a login form, routes, modified home controller
fixed conflict
Merge pull request #2 from spotfinder/karina

Karina