Quickstart add request: burningTyger/openshift_moodle
Quickstart add request: openshift/joomla-example
Merge pull request #1 from dmueller2001/burningTyger-openshift_moodle

Quickstart add request: burningTyger/openshift_moodle
Quickstart add request: getupcloud/wordpress-exemplo
joomla added
getupcloud wp added
Update index.html
Update index.html
Merge branch 'master' of github.com:dmueller2001/oo-index

diane deleted index.html and needs to restore it
Update index.html
Merge branch 'master' of github.com:dmueller2001/oo-index

diane added a footer to index.html test
Update index.html

messing with footer on index.html
Merge branch 'master' of github.com:dmueller2001/oo-index

messing with footer on index.html
Merge branch 'master' of https://github.com/openshift/oo-index

Conflicts:
	wsgi/templates/index.html

messing with index.html