finished this
yup Merge branch 'master' of github.com:whauwiller/catan-web-client

Conflicts:
	gameplay/js/points/PointsController.js