marked stuff i'll be working on
Merge pull request #2 from ClassicallyGeek/paladinPatty

marked stuff i'll be working on
Merging in master