Once a hero, Adam is now a villian
Merge branch 'master' of https://github.com/Duke-Medical-Instrumentation/class-sandbox-repo

Conflicts:
	README.md