Fix Merge Conflict
Merge pull request #6 from mattwojo/CreateGridView

Fix Merge Conflict