began testing model init
Merge branch 'master' of https://github.com/whauwiller/catan-web-client

Conflicts:
	gameplay/js/model/clientmodel.js
Merge branch 'master' of https://github.com/whauwiller/catan-web-client

Conflicts:
	gameplay/js/model/clientmodel.js