nothing done, wrote and erased
Merge branch 'master' of github.com:ioa42/ld30

Conflicts:
	Prop.cpp
	Prop.h