Lab4 fix and complete.... Hopefully...

Eclpise does not have a great git system...... Oh god the pain