Merge branch 'master' of https://github.com/Slowpoke101/FTBLaunch

Conflicts:
	src/net/ftb/gui/LaunchFrame.java