i have no idea what i'm doing
Merge branch 'master' of https://github.com/SUPDEWEB/wetrip

Conflicts:
	event_creation.php