fixed a bug

grass giving a null pointer
Merge branch 'master' of https://github.com/quinston/summative2013