LALAL
Fixe merge
Merge branch 'development' of http://github.com/SMUDFS/springb2014 into development
May have fixed close enough distance
Merge branch 'development' of http://github.com/SMUDFS/springb2014 into development

Conflicts:
	GameMakerTycoon/GameMakerTycoon.userprefs
Stuff
They get close enough to each other now... but not too close lol #hashtag