Merge origin/master

Conflicts:
	src/shittyproject/ShittyProject.java
Merge origin/master