.pyc
merge
forgot to stop server
Merge branch 'master' of https://github.com/hadimuhammad/InPress

Conflicts:
	inPress/inPress/settings.pyc
	inPress/inPress/urls.pyc
	inPress/module/admin.pyc
	inPress/module/models.pyc
	inPress/module/views.pyc