removed merge characters
Merge branch 'master' of https://github.com/jtwarren/mit_fixit
job4 stuff fixed