no message
Merge branch 'master' of https://github.com/pgaret/EGDP3

Conflicts:
	EDGP3/Assets/Peregrin's Scene.unity
	EDGP3/Assets/Peregrin's Work/Enemy4.prefab
	EDGP3/EDGP3.userprefs