mergerating
Merge branch 'master' of http://github.com/k-may/kevmayo-current
working towards the grid interface