Added all changes, YOLO
Merge branch 'master' of github.com:averagejoey2000/gits-and-shiggles