fixed null pointer exection
Merge branch 'master' of github.com:unixninja92/COMSC-341-Digger