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

Conflicts:
	README.md