Added event flags
Merge is really bugging me
Updated gitignore