prefs
Merge branch 'master' into GunGame_creation
Adds two more subtypes in Tetris
Merge branch 'GunGame_creation'
Merge branch 'master' into Tetris_modifications

Conflicts:
	src/com/kry/brickgame/games/TetrisGame.java