add perso + event
Merge branch 'master' of github.com:Deltaxel/GameJam

Conflicts:
	GameJam/GameJam/main.cpp