tmp folder removed from git
Merge branch 'master' of https://github.com/mvandeloo/360life

Conflicts:
	.gitignore
css update
css update