merge with master
changes for patty's stuff
Merge pull request #25 from ClassicallyGeek/paladinPatty

Paladin patty