i hate you
base bootstrap css is being covered by slate.css
Merge branch 'master' into bug/js-dates

Conflicts:
	application/public/assets/js/angular/services.js
Merge pull request #36 from raventools/bug/js-dates

Bug/js dates