Added .gitignore
Merge branch 'team1' of https://github.com/bigdatabe/p2 into team1