css log in
Merge branch 'master' of http://github.com/cicer1/hintsite

Conflicts:
	css/style.css