fix
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	Instamoz/settings.pyc