changing presentation
Merge branch 'master' of github.com:rafalima/mobileconf2013