changed login from php to html
Merge remote-tracking branch 'origin/master'

Conflicts:
	login.html
Merge remote-tracking branch 'origin/master'
added caching and compression from HTML5 boilerplate