commented out the second context menu as it is currently redundant
Merge branch 'master' of https://github.com/bsanders/softeng
fixed context menu for realz
Merge branch 'master' of https://github.com/bsanders/softeng