pakko bulla
levels
Pommit ehkä etenee
Merge branch 'sec' of https://github.com/Ukkostaja/sampleshooter into sec

Conflicts:
	assets/level1.txt
	src/com/sampleshooter/Game.java
MERGE WAR
Vaihteeksi kommit
COMMAAA
Vai että takas pienemmäksi
Tää on melkein valmis.
pelottavan lähellä valmista
kun kerran haluat multa
Merging is complete.
toimi paska
Going to merge.
Merge remote-tracking branch 'origin/sec'

Conflicts:
	assets/level1.txt
	assets/patterns.txt
	src/com/sampleshooter/Engine.java
	src/com/sampleshooter/Game.java
	src/com/sampleshooter/GameEngine.java
	src/com/sampleshooter/GameScreen.java
	src/com/sampleshooter/Level.java
	src/com/sampleshooter/Luoti.java
	src/com/sampleshooter/Patterns.java
	src/com/sampleshooter/Player.java
	src/com/sampleshooter/Pommi.java
Introscreenin lisäys jne.
New introscreen.
Introscreen fix.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sampleshooter/Art.java
	src/com/sampleshooter/Game.java
	src/com/sampleshooter/GameEngine.java
	src/com/sampleshooter/Lines.java
	src/com/sampleshooter/Luoti.java
	src/com/sampleshooter/Pommi.java
Merge remote-tracking branch 'origin/master'