Some changes that I cant remember
the merge things
Merge branch 'master'
Merge branch 'master'
Made progress on the states. Also I defined the printOptions in the Menu class already because it neverchanges.