merge konflik changes to commit
fixes merge

Conflicts:
	src/shittyproject/ShittyProject.java
even more merge

Merge branch 'master' of https://github.com/CodingCo/project-x

Conflicts:
	src/shittyproject/ShittyProject.java
jaa

Conflicts:
	src/shittyproject/ShittyProject.java