Fixed build error
Merge branch 'master' of https://github.com/jBot42/jbot42.github.io

Conflicts:
	css/style.css