Merge branch 'master' of https://github.com/superlopuh/www

Conflicts:
	index.html
someone will have to teach me how to do this conflict crap