Editing table 2.
James tries to do it right.
Merge branch 'master' of https://github.com/david-deboer/msip-2014