CSS update 2
Merge branch 'master' of https://github.com/heyaugust/localfriends

Conflicts:
	views/login.html