commiting before I can merge
commiting before I can merge
fixed 2 conflixes and added .gitignore