init
Merge pull request #2 from FunnyParty/1.0

init