Create fish app
Merge branch 'master' of https://github.com/nicolasgiannuzzi/schoolfish

Conflicts:
	schoolfish/settings.pyc