#10: Removed embedded bootstrap code
Merge branch 'feature/10-remove-embedded-bootstrap'