Stuff
Merge branch 'master' of https://github.com/johnlev/Python

Conflicts:
	.DS_Store
	Lazer/GeneralMethods.pyc
	Lazer/MainPygameApp.pyc
	Lazer/MenuButtons.pyc
	Lazer/NormalGameMode/ActionQuestioner.pyc
	Lazer/NormalGameMode/Block.pyc
	Lazer/NormalGameMode/Kings.py
	Lazer/NormalGameMode/Kings.pyc
	Lazer/NormalGameMode/Mirror.py
	Lazer/NormalGameMode/Mirror.pyc
	Lazer/NormalGameMode/PygameApp.pyc
	Lazer/NormalGameMode/Shooter.pyc
	Lazer/NormalGameMode/__init__.pyc
	Lazer/NormalGameMode/doubleMirror.pyc
	Lazer/NormalGameMode/highlightedArea.pyc
	Lazer/NormalGameMode/normalGameMode.py
	Lazer/NormalGameMode/normalGameMode.pyc

\