img
font
Merge branch 'master' of https://github.com/nicolasgiannuzzi/schoolfish

Conflicts:
	authentification/__init__.pyc
	authentification/form.pyc
	authentification/models.pyc
	authentification/urls.pyc
	authentification/views.pyc
	home/__init__.pyc
	home/models.pyc
	home/urls.pyc
	home/views.pyc
	school_fish
	schoolfish/__init__.pyc
	schoolfish/settings.pyc
	schoolfish/urls.pyc
	schoolfish/wsgi.pyc
	templates/layout/base.html