Confused about github
Merge branch 'master' of https://github.com/SethBaldwin/Sorry

Conflicts:
	Sorry!/MyForm.h