Merge pull request #8 from gouwestadmm/Lexie's-branch

Lexie's branch merge into master
bs commit
Git merge master with updated bootstrap