Creating template
Merge branch 'master' of git://github.com/openshift/django-example
Merge branch 'master' of ssh://foodcoop-rehovot.rhcloud.com/~/git/foodcoop