idiot 2.0 strikes again :P
Merge branch 'master' of github.com:OddState/Blog

Conflicts:
	index.html