Updated revtable.py
Merging resolution
merge conflict resolution
Merge branch 'master' of https://github.com/acvmanzo/code
Update