ignore files
Merge branch 'dev'

Conflicts:
	dj/settings.pyc
Added e-mail and registration to the commit list