updates
Merge branch 'master' of https://github.com/adi87/adi87.github.io

Conflicts:
	index.html