gitignore file
.pyc files removed from repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	webengine/legaldocs/settings.pyc
	webengine/legaldocs/urls.pyc
removed .pyc files from repo