main.js
Merge branch 'master' of https://github.com/jannypie/jannypie.github.io

Conflicts:
	_site/js/main.js
main.js