Initial commit
Adding django project
Configure settings to run with heroku
Install dj-static
Add deploy descriptions
Workaround for django-decouple
Add psycopg2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore