Continuing website developpement...
Merge branch 'master' of https://github.com/thejohncrafter/thejohncrafter.github.io

Conflicts:
	index.html

Commit because of conflicts...