Merge buildings to Master
Merge branch 'master' into buildings

Buildings are now built from resource files. They can be selected, and when selected, they build units.
Merging.