First commit
added reqs
merging edits to work on Ubuntu server.
merging
Merge branch 'master' of https://github.com/ibtokin/silver-spork

Conflicts:
	mysite/db.sqlite3
	mysite/templates/admin/base_site.html