Revert "More columns"

This reverts commit 0f7c5d884977cfaaee5bb72aa062adea46ee8fd9.
Revert "Revert "More columns""

This reverts commit 613d160d5d5890a0f78fd06f36ec5294f2ebb7cc.
Merge branch 'master' of https://github.com/thervh70/OOProject