beginning of showcombo page
Merge branch 'master' of https://github.com/tihuang/combopedia_heroku
plus any files I added