Nothing changed really
Merge branch 'master' of https://github.com/Jantunovic/soughtAfterSite

Conflicts:
	config/autoload/global.php