grid functionality
Merge branch 'master' of github.com:rishabt/dpm-final