more updates
Merge branch 'master' of https://github.com/birdman1155/byu

Conflicts:
	README
change