Skrivit hammare
Merge branch 'master' of https://github.com/johnnygoy/testapp

Conflicts:
	john.txt