first change
second change
Merge branch 'master' of https://github.com/asadki/openshift-django-helloworld