Make ship

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Merge branch 'master' of https://github.com/samphippen/ggj2013
Merge branch 'master' of https://github.com/samphippen/ggj2013
Full screen

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Merge branch 'master' of https://github.com/samphippen/ggj2013

Conflicts:
	ggj2013-desktop/bin/data/constants.txt

Signed-off-by: Sam Phippen <samphippen@googlemail.com>