Creating template
Integrates github with openshift
Merge branch 'master' of https://github.com/adamRenny/Website

Conflicts:
	.gitignore
	README.md