Finished most of it, just need to work on the todo comments
Merge branch 'master' of https://github.com/elenam/mics2014introclass