I manually merged the Menu.java files

The Auto merge was a little weird. The JFrame properties are on the
bottom, I made it setResizable(false);
Added the listener methods from Rohit