minor changes
Merge branch 'master' of https://github.com/Snie/LaBarista

Conflicts:
	Nicolo's Art stuff/tables.blend
	Nicolo's Art stuff/tables.blend1
wtf
trying to fix