Manual Merger of Mine and Matts recent Commits

My Git decided to over write all of matts changes and the overwrite all
of mine with his the next time... didnt get me and propper merge options
so I had to manually check and do it all my self... Might have missed
some things cus Git was Gay