Moved devise login to a partial. Setup login on homepage as well as devise login. Styled up the homepage.
Fixed merged conflicts.
Fixed committed database.yml
Cosmetic
Fixed failed tests.
Fixed merge conflicts.