Priy is da bomb
Resolved conflict .gitignore