update
commit update
commit merge Merge branch 'master' of https://github.com/ChorTeam/ChortApp

Conflicts:
	.gitignore