initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	STGdjango/urls.py
initial commit