Skapade en main
gört
ignore
Merge branch 'master' of https://github.com/hxmn/Lab2

Conflicts:
	README.md
	src/Main.java