Question master stying finished
Merge branch 'master' of https://github.com/pixelpusher/mozfest2013