Fiddlin aboot.
Merge branch 'master' of github.com:cmusv-sc/SoCSp2014-Project3
Prettied up output.