fixed it
Merge branch 'master' of https://github.com/Mideah/mideah.github.com

Conflicts:
	index.html