Merge pull request #7 from Jbtyson/master

Merging changes in master into resources.
added mining variables to unit.js
resolving conflict in unit.js
various improvements
hoplites are called hoplites because they love pogo sticks.
Merge branch 'master' of https://github.com/Jbtyson/cis580-rts

Conflicts:
	rts/src/rts.js
added new tile images
Merge remote-tracking branch 'origin/ai'
Fixing shit
Fixin moar stuff
tons of little fixes
resolving conflicts in input
Revert "resolving conflicts in input"
"undoing unintended push"

This reverts commit 93f9f47d1a0dc1aa90451378e498c2481ca7e81a, reversing
changes made to 5934bdbf1c4f79210234480bf8d58ce4c5cb73f4.

:wq
resolved conflict in unit.js.  kept head(master)
Merge pull request #21 from Jbtyson/master

merge master into resources
"updated resource management between different gamobjects"
"reconnected gui resource bar to correct game object"
"factions track supply correctly"
MineralMine.js - fixed reneder location and hitbox
Merge pull request #22 from Jbtyson/resources

Merge resources into master
Added Barracks, Connector, and unit build position.

Barracks and connector buildings now appear. Also buildings can be
rotated. Finally units will spawn one at a time around the town center.
Merge pull request #23 from Jbtyson/buildings

Added Barracks, Connector, and unit build position.