Now using the bootstrap-rails gem instead of the raw bootstrap css
Merge branch 'master' into level-model