added a lot of stuff. I put comments in.
Forgot to add some files...
Merge remote-tracking branch 'upstream/master'
holla
Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/model/Game.java
Merge pull request #11 from WClement/master

Added a shitton.