fixing git... need to remember to GIT PULL every time
Merge branch 'dev'