Commit for the night
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/LordofDorknes/letsmodagain/letsmodagain.java