updated login page UI
Merge branch 'master' of https://github.com/stpddream/whoisgoingtodc

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/static_pages/home.html.erb
	app/views/users/_signup.html.erb

merge:kbmimergimerge:wq:q!
Merge branch 'master' of https://github.com/stpddream/whoisgoingtodc

:qkbq
Merge branch 'master' of https://github.com/stpddream/whoisgoingtodc

ekbkb:wq:q
:wq:q
Merge branch 'master' of https://github.com/stpddream/whoisgoingtodc

:q