Fixed all the stuff that GIT messed up...I hate you GIT.