working on merge
Trying to merge... probably breaking things
Sill merging...
Merge branch 'master' of
https://github.com/mithicfear/D-D-Creature-Gen.git