added all files to git
added my own patch against --events warning
merged conflict solved