gitignore
ignore
Merge branch 'master' of https://github.com/getflourish/feedbacktool

Conflicts:
	.DS_Store
	.gitignore