Merge remote-tracking branch 'origin/factioning' into gui
Merge remote-tracking branch 'origin/start_end' into gui
Revert "Basic Pathfinding"

This reverts commit 6b0c5fa5d3ece743d891e020a7434ab81893d9cc.

Basic Pathfinding

I've implemented some basic pathfinding that uses the
tile attributes to
determine valid paths
Thank God I had a backup

I accidentally erased my first commit and almost everything, whoops.
bugfixes
moar bugfixes
added display box in the minimap section to indicate our view.  Doesn't scootch or anything yet
Added notes
Added the Scootching of the Screen
Removed useless log messages
Added a few modifications to tilemap.js in preparation to add the minimap.  Currently everything I've done has no effect on the current game so no need to worry about something being broken.
Add soundtrack music files
Merge remote-tracking branch 'origin/start_end' into PathFinding
Merge remote-tracking branch 'origin/buildings' into PathFinding
Merge remote-tracking branch 'origin/Units' into PathFinding
Merge remote-tracking branch 'origin/start_end' into gui
Merge remote-tracking branch 'origin/resources' into gui
Updated the stack shaker

The stack shaker is no longer random
Merge branch 'PathFinding' of https://github.com/Jbtyson/cis580-rts into PathFinding

Conflicts:
	rts/index.html
	rts/src/units/hoplite.js
	rts/src/units/unit.js
Merge branch 'PathFinding' of https://github.com/Jbtyson/cis580-rts into PathFinding

Conflicts:
	rts/index.html
	rts/src/units/hoplite.js
	rts/src/units/unit.js