Added .gitignore to p2
Merged changes