Added gitignore
Fixed collisions in test cases
First attempt at working code