Coachella Project

Initial commit
Merge branch 'master' of github.com:cirdes/coachella

Conflicts:
	.gitignore