Whateva

Na
Merge branch 'master' of https://github.com/lumened/website

Conflicts:
	about.html
	css/bootstrap.css