MergeAfterCristmasBreak

i missed some things but these are the most important ones
Merge branch 'master' of https://github.com/maskedmous/Back_To_Basics