r	IWAT/IWAT/settings.py
Merge branch 'master' of https://github.com/malikfassi/IWANTATEACHER