checkpoint
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/pixelframework/Controller.java
checkpoint