lotta stuff
Merge branch 'master' of github.com:hmgibson23/Generica-Stuff