fixing column issues
 fixed merge conflicts
Merge branch 'master' of https://github.com/blakeelias/Pizza-Button