console text now stays in bounds
Merge remote-tracking branch 'tom/master' into dev
added grid
Changed ambiguous ++ operator