Update to latest bootstrap version
Git merge master with updated bootstrap
Merge pull request #9 from gouwestadmm/Lexie's-branch

Update to latest bootstrap version
Merge pull request #10 from gouwestadmm/showcase-responsive-2

Showcase responsive 2
Undo merge jeroens work
Merge branch 'Lexie's-branch' of https://github.com/gouwestadmm/basis into Lexie's-branch
Ok, merge fix
Fix current slide script error
Menu stuff
menu updates
lexies stuff
Merge pull request #11 from gouwestadmm/Lexie's-branch

Lexie's branch
master update
Merge pull request #13 from gouwestadmm/Lexie's-branch

master update with lexies branch
fix merge conflicts