Feb 11 slides
part 2 of committing to get it to merge right
Merge branch 'master' of https://github.com/aaronjfisher/ADAMachine

Conflicts:
	2013 Files/.Rhistory