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
added ui click registering and preventing clicking underneath the ui
resolved conflicts
turned music off for sanity
fixed conflicts
fixed errors as a result of the merge
command panel buttons can now be clicked
fixed command panel bug
added unit action template, thumbs field, and selection from the unit bar
unit bar selection correctly creates a new array now
Started implementing mining
Merge pull request #13 from Jbtyson/master

Merging Master into Units