Creating wit controller
adding gitignore
Merge branch 'FirstWit' into dev
Try to create merge conflict
Merge branch 'dev'