installed django
Merge branch 'master' of https://github.com/kmad87/oneFeed

Conflicts:
	oneFeed/__init__.pyc
	oneFeed/models.pyc
	oneFeed/settings.pyc
	oneFeed/urls.pyc
	oneFeed/utils.pyc
	oneFeed/views.pyc
	oneFeed/wsgi.pyc