formatted login page
Merge branch 'master' of github.com:EthanGould/Texchange

Conflicts:
	db/seeds.rb