Updated from class on 10.1.2014
just kidding final 10.1.2014
Edits 10/9/2014