no message
Merge branch 'master' of https://github.com/Sloth6/Colludo

Conflicts:
	app/client/js/utilities.js
ADDED JOSHES NEW ART AND MADE BUILDING ACTUALLY WORK!
- When turning a forrest into a lumber camp, for example, it will keep its image number. but when building on a field, a random house type is constructed.