modified settings.py and wsgi.py per heroku instructions
Merge branch 'master' of https://github.com/aiisahik/krindle

Conflicts:
	.gitignore
merging .gitignore conflicts
Merge branch 'master' of https://github.com/aiisahik/krindle