update as of 5:02 pm on august 3
Merge branch 'master' of https://github.com/hidalgorodel/CIS