added goal, lots of other stuff
Merge branch 'master' of github.com:Pjchardt/PinkElephant

Conflicts:
	Assets/test rooms.unity
	ProjectSettings/TagManager.asset
made my changes again