project panel
Merge branch 'master' of https://github.com/pboechat/LittleBigCompany

Conflicts:
	Assets/Scenes/Main.unity