operating companies
Merge branch 'citrus' of https://github.com/miguelSantirso/ludum_dare_29 into citrus

Conflicts:
	lib/water.swc