initial merge adding collection view
Merge branch 'master' of https://github.com/ibyon/Matchismo_III