assignment-03 commit
Merge branch 'master' of github.com:derekjuhl/itc240-2014
Reconcile remote repo with local copy.