Ready for Merge (I hope)

Added JUnit tests for Grid, bit of touch up in Box, Grid, Square classes