my first commit in whoozin
Fix auto-merge conflicts