Merge branch 'master' of https://github.com/wdi-hk-sep-2014/beertopiai
destroyed scaffolds and migration, successfully re-done and seeded without issue
Categories page images and link functional, still needs connecting to appropriate items show
DRY'ed CSS right up!
embedded vimeo video on about page
added bootstrap carousel on the welcome page. cleaned up categories css code
Merge pull request #7 from makzimillian/master

categories page image & opacity feature. embedded vimeo video on about page