Merge branch 'master' of http://github.com/p4bloch/bikestorming