merge
git ignore file updates
commit before pulling from work
adding mobile
updates after merge