fucking whitespace
save...
save
Merge branch 'master' of github.com:Theo13/GGJ2014

Conflicts:
	src/DisplayManager.cpp
Merge branch 'master' of github.com:Theo13/GGJ2014

Conflicts:
	src/DisplayManager.cpp
random placement...
random fixed waiting for predefined enemy reaction
Merge branch 'master' of github.com:Theo13/GGJ2014
Merge branch 'master' of github.com:Theo13/GGJ2014
add boss