solved push conflicts, see .gitignore
Merge branch 'master' of https://github.com/kaleb-himes/Jacob_Angelica_Kaleb_NEW
solved commit issues, see .gitignore for solution