laptop stupid
Merge branch 'master' of https://github.com/TuxedoFish/MyWorkspace.git

Conflicts:
	Marchgame/org.tuxedofish.marchgame/data/highscores.txt
added all the new stuff from computer and made it laptop compatible