Merge branch 'master' of github.com:Battlefy/Viceroy

Conflicts:
	lib/model.js