added logo
Merge branch 'master' of https://github.com/mvandeloo/360life

Conflicts:
	.DS_Store
	log/development.log