included stuff
Merge branch 'master' into Board_1
starting to change the grid to a template
fixed compile errors
striped a lot off stuff
Improved Jappie's code a bit.
merge
changed namespace