initial commit, round two coming soon
Fixed conditional logic for setting up the game
Merge pull request #7 from nwcaldwell/brett

Brett
Added Developer things
Merge branch 'master' into mauricio

Conflicts:
	src/models/Board.java
	src/models/Developer.java