Checkpoint (Switching computers)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/application/Application.java