Fixed error
Finished menu functionnality
Merge
Small fix
Remove useless debug
BS
Fixes bug
Merge branch 'master' into francis-branch
Commit of things and such and potato salad