edit index
Merge branch 'master' of https://github.com/martakus/martakus.github.io

Conflicts:
	index.html
?