updates to gitpull
blah
Merge remote-tracking branch 'origin/develop' into develop