update 04.09.2014
Merge branch 'master' of github.com:hnndevs/blog

Conflicts:
	index.html