Merge remote-tracking branch 'origin/factioning' into gui
Merge remote-tracking branch 'origin/start_end' into gui
added display box in the minimap section to indicate our view.  Doesn't scootch or anything yet
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 gui
Merge remote-tracking branch 'origin/resources' into gui
Working on UI buttons for buildings.
Merge branch 'resources' of github.com:Jbtyson/cis580-rts into buildings
Adding ui buttons for buildings.
added ui click registering and preventing clicking underneath the ui
Worked on units

Units now stop when they get within attack range. Units now use sprite
sheets. Infantry range and size buffed.
Merge remote-tracking branch 'origin/master' into Units
Added command panel button for building.
Resources subtracted and supply added.
removed unused resource.js and metal.js
Updated Unit Appearance
Merge branch 'buildings' into resources