working on developer movement and addition
merging with master
pushing for Jose to get my code
merging
Merge branch 'master' into mauricio