cleaned up index to use autoload
Merge branch 'master' into auto-play

Conflicts:
	index.php