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

Conflicts:
	.gitignore
	images/data.json
foo