Removed conflicted code
Merge pull request #16 from juanfernandes/patch-2

Removed conflicted code
v2.2.0 - Revisiting the grid and the entire framework