Capitalize, remove hyphens
Merge branch 'master' into problem

Conflicts:
	README.md
Merge pull request #15 from githubteacher/problem

Capitalize, remove hyphens