första
andra
sanningen kom fram
kebab
Ny och fräsch
Merge origin/master

Conflicts:
	src/java/controller/Name.java
Merge origin/master

Conflicts:
	src/java/controller/Name.java
Merge origin/master
Merge origin/master
yesman