REadded .gitignore
Merge branch 'master' of github.com:Jens84/dmup

Conflicts:
	web/Turbot/__init__.pyc
	web/Turbot/settings.pyc
	web/Turbot/urls.pyc
	web/Turbot/wsgi.pyc
	web/basic_forms/__init__.pyc
	web/basic_forms/admin.pyc
	web/basic_forms/migrations/0001_initial.pyc
	web/basic_forms/migrations/__init__.pyc
	web/basic_forms/models.pyc
	web/basic_forms/urls.pyc
	web/basic_forms/views.pyc
	web/turbot.db