updated README, and made some changes to various files
Merge branch 'master' of github.com:MitchCarroll/guiletest

Conflicts:
	README