Added canvas and changed Brick, Ball, and Paddle

So it can easily update from information from other classes.
Merge remote-tracking branch 'origin/master' into Engine-Implimentation
Merge branch 'Engine-Implimentation'

Conflicts:

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
AABB.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Ball.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Brick.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Physics.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Rectangle.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
RegionMap.class
	BrickBreak/res/layout/activity_main_menu.xml

BrickBreak/src/edu/troy/cs3360/fall2013/team1/brickbreak/engine/Ball.jav
a

BrickBreak/src/edu/troy/cs3360/fall2013/team1/brickbreak/engine/Brick.ja
va
Merge branch 'RegionMap-Delete_Implementation'

Conflicts:

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
AABB.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Ball.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Brick.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Paddle.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Physics.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
Rectangle.class

BrickBreak/bin/classes/edu/troy/cs3360/fall2013/team1/brickbreak/engine/
RegionMap.class

BrickBreak/src/edu/troy/cs3360/fall2013/team1/brickbreak/engine/Ball.jav
a

BrickBreak/src/edu/troy/cs3360/fall2013/team1/brickbreak/engine/Brick.ja
va

BrickBreak/src/edu/troy/cs3360/fall2013/team1/brickbreak/engine/Paddle.j
ava
Auto-gen
Removed Merge Files
Deleting Class Files
Untracking Classes
Merge remote-tracking branch 'origin/RegionMap-Delete_Implementation'

Conflicts:
	BrickBreak/bin/classes/.gitignore

Fixing .gitignore
Fixing .gitignore
Merging Master changes into MainMenu branch