hello github, this is my first commit. all my other commits were via svn
Merge https://github.com/hachacha/petri