Test migration to Django 1.7
Merge branch 'dj17' of https://github.com/darthryking/djangotemplate into dj17
added placeholder.txt