Restarted
Merge branch 'master' of https://github.com/gavindinubilo/gavindinubilo.github.io

Conflicts:
	js/player.js