adding custom mmm style
solving merge conflict
Merge branch 'master' of github.com:marteb/mmm2013-webrtc-reveal