c
 d
Merge branch 'master' of ssh://git@github.com/imscaradh/clevermaze.git

Conflicts:
	CleverMaze/src/ch/gibb/project/activity/Level.java
	CleverMaze/src/ch/gibb/project/enums/StageEnum.java