Added the subcategory ResearchBuilding, and abstracted the advance
timestep to be different for each type of building.
Updated old code to reflect ResearchBuilding being added.
Added 3 new research technologies
Added a blacksmith research technology
Added functionality for timestep on research
Updated Research and Technology functionality
Added Research Technology Command
Added Test for Research timestep
Changed Production, Research, and ResourceBuilding to be interfaces that
building will implement.
Fixed Bugs generated from making Building interfaces
Updated the functionality for the Farm with new interface
Fixed a bug in Resources
Updated GoldMine to new interface and added tests
Finished resource building implementation
Fully implemented resource buildings, which will generate resources to
the player every time advanceResourceProduction is called.
Added some functionality for multiple interfaces to one building, still
needs more implementation.  Added more tests.
Updated Controller and GameModel to process all building actions in one
method, called TickBuildings.
Added Documentation to Building Interfaces
Fixing up buildings
Updated documentation
Rename
Merge branch 'research' into merge

Conflicts:
	src/control/GameModel.java
Merge branch 'dev' of https://github.com/CSc436/Project-4x into research

Conflicts:
	src/control/GameModel.java
Merge pull request #32 from CSc436/research

Research