Adding bootstrap-sass elements to style.scss
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/sass/style.scss
Merge pull request #4 from lhenze/master

Bootstrap rolled into style.scss; recent titles markup