we are not using this anymore
Merge branch 'master' of https://github.com/MattivdWeem/SkySocial

Conflicts:
	controllers/connection.php