Factory implementation
Merge branch 'master' of git@github.com:gamesource/Risk.git

Conflicts:
	src/model/Continent.java