Merge pull request #1 from fergBurglerr/master

get new changes
generalized draw and erase to work on both using the same fucntion
Merge branch 'master' of https://github.com/Zylox/gnop
fixed merge conflict