added error highlighting
Merge branch 'master' of https://github.com/IanFinlayson/tetra