remove merges directory from gitignore
Merge pull request #41 from etown/milestone-1-bugs

remove merges directory from gitignore