Creating template
Merge branch 'master' of ssh://nina-ashliewebb.rhcloud.com/~/git/nina

Conflicts:
	README.md
	package.json