initial commit
Merge branch 'master' of github.com:TiO2/openshift-django17-bootstrap

Pull