.
Merge branch 'master' of https://github.com/ramp818/LightsOutAlfa

Conflicts:
	LightsOut/src/lightsout/Level1.java
	LightsOut/src/lightsout/Menu.java