Some changes during debugging
Merge branch 'master' of github.com:knealon/Siena_College_Kelly_Nealon
Buffer basically working.