Adding a simple readmy
more text to readme.txt
fix untracked files
Gitignore fix
Merge branch 'master' into production

Conflicts:
	TheoryWeb/settings.py
	TheoryWeb/settings.py~
	TheoryWeb/urls.py~
	readme.txt