I think this is more truthful
Merge branch 'master' of https://github.com/FRC1076/assorted.git

Conflicts:
	avery