Trying to clean everything up
Merge branch 'master' of github.com:MakiCode/Frankenstein
Still trying to clean everything up