initial commit
Merge branch 'master' of https://github.com/Ammoneit/TimsStruppis
Merge branch 'master' of https://github.com/Ammoneit/TimsStruppis