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