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

Conflicts:
	school_fish
	schoolfish/settings.pyc
	schoolfish/urls.pyc