Commit/Merge confusion

-everything should be back on track with this commit.
-See previous commits for actual work done.