new art folder. temp
Merge branch 'master' of https://github.com/poofytoo/aubergine

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/poofytoo/aubergine
fixed templates, moved back in the app folder #6581399930519