Rows, cols and carousel
Merge branch 'master' of https://github.com/sardell/CSC394_TEAM_A_FinalProject into style_adds