hex mods, hex factory, hex classes, joining hexes
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

Conflicts:
	KingNThings/src/com/model/Hex.java
	KingNThings/src/com/model/game/Game.java
	KingNThings/src/com/presenter/HexFactory.java