Merge branch 'master' of github.com:teamfish/fish-app

Conflicts:
	.gitignore
	README.md