Merge branch 'master' of https://github.com/Arcrammer/Haus-of-Alexander

Conflicts:
	PHP_Playground/index.php