Merge pull request #17 from GiantCowFilms/master

Fixed Mats
Fixed Stuff
Merge pull request #18 from GiantCowFilms/GiantCowFilmsDev

Giant cow films dev - Add Hex Map
Merge pull request #19 from GiantCowFilms/master

Merge pull request #18 from GiantCowFilms/GiantCowFilmsDev
Merge branch 'X-27Dev'
Merge branch 'master' of https://github.com/GiantCowFilms/InterPlanetGame-Maps

Conflicts:
	Completed/6-Users/Blends/Hectagonal.blend
Update Hectagonal.json
Merge pull request #22 from GiantCowFilms/GiantCowFilmsDev

Merge pull request #19 from GiantCowFilms/master
Fixing
More Fixing
More Fixing
Fix Conflict
Merge pull request #24 from GiantCowFilms/GiantCowFilmsDev

Giant cow films dev
Merge pull request #25 from GiantCowFilms/master

Updating X-27 Branch