I added a boolean collision method in the Map class
This commit was only so that I could merge with other documents
To do this I deleted the Map and Player classes
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
added .gitignore
Merge remote-tracking branch 'sbonner1/master'
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
removed x and y parameters from Player's canMove() method. Since this
method is already in the player class, we can just use this.x and
this.y.
changed Player's canMove() method from private to public method. Also,
changed canMove() method so it might actually work. Added a JUnit test
for the method in PlayerTest().
changed doubles to ints. Also added javadoc comments to all methods in
Player and Zombie classes.
Adding the view
Merge remote-tracking branch 'aschin/master'
Added event handler to button
added weapon class

Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
dshdgf