cenas
more stuff to the menu
added exit functionality
fixed conflict
conflicts