Pramit's commit 1
Creating Conflict
Merge branch 'master' of github.com:dougzthugzinterns/Practice
git practice
Jon's Stuff
Jon's Stuff
Merge branch 'master' of github.com:dougzthugzinterns/Practice
Adding Branch
Changed name into pramit silwal
Creating Conflict
Merge Attempt
Grrrr
merge Pramit Branch
Brian name added
Merged David Branch