Version 1.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/connorlinfoot/whatversion/Main.java