Revert 97f340a..6d58bc5

This rolls back to commit 97f340a0071ad1b4c90615f12c095e540f630bc7.
Merge branch 'Charlie-Branch'
opencv framework replaced
nothing
Merge branch 'Charlie-Branch'
Merge branch 'master' of https://github.com/Charlie-Github/TestGray
add adding border function
Merge branch 'master' into Charlie-Branch
clean up