Masodik commitom

Settings és mentés elkezdve
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/archhazi/spaceshooter/MainMenuActivity.java
	app/src/main/res/layout/activity_game_over.xml