add project to git
Merge branch 'master' of https://github.com/mocean/shows

Conflicts:
	.gitignore