update gitignore to ignore settings and workspace
no message
no message
Merge branch 'master' of https://github.com/Kronen/Tango

Conflicts:
	.idea/workspace.xml
	TangoWithDjango/__pycache__/settings.cpython-34.pyc
	TangoWithDjango/settings.py