Fixed all the merge errors
Update Perk.java

Added in all the perks on the wiki page and arranged them in Tier 0 levelup perks, Tier 1 levelup perks, Tier 2 levelup perks, Holiday perks, Event perks, and Item perks.

Some of the things in Item perks are perks giving by using a certain item after the conditions have been meet for example "Oviposition May be gained by drinking Reptilum while having a vagina and a lizard score over 3. Lost if lizard score drops below 3." I figured sense it took drinking Reptilum eg a item it belonged in the Items perk section, just my thoughts.

Nothing else was changed except adding all the perks on the wiki page.
Merge pull request #4 from MrBlazzar/patch-1

Update Perk.java
Merge branch 'master' of github.com:zadenikt/CorruptionOfChampions
Update README.md
Update README.md
Housekeeping

Tabs to spaces.
Braces for if/for statements
Don't be stingy on the linebreaks.
Made a writef method that allows for Format strings in writes to the ui.

Created getters/setters for Actor.
Merge Fixes.