Moved requirements.txt to project root for Heroku
Procfile
django12factor
README
fix merge conflict
loaddata docs