Changed on computer and at github, should conflict
Merge branch 'master' of https://github.com/nortontower/trial

Conflicts:
	README.md