[ADDED] Menu
Merge branch 'master' of https://github.com/djouv/ludum

Conflicts:
	src/ludum/Main.java