Added Boot.java for test purposes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Boot.java