gemfile
fix conflict with nokigiri
Merge branch 'master' of https://github.com/madelinec/eventus
bootstrap baby
merging bootstrap babes