text updates
Merge branch 'master' of ssh://github.com/picttarge/ggj14
title screen and tidy up changes
fix conflict
text updates