Creating template
Merge branch 'master' into merging
	deleted:    README
	deleted:    diy/index.html
	deleted:    diy/testrubyserver.rb
	deleted:    misc/.gitkeep
#2 : OpenShift integration