Index and shit
Merge branch 'master' of github.com:Frozzzie/SEP-Not-Scoping

Conflicts:
	index.php