Inital template commit
Merge branch 'github/master'

Conflicts:
	README.md