log4j
Merge branch 'master' of https://github.com/Trigonometry-F/ModpackInstaller

Conflicts:
	ModpackInstaller/src/net/teamtf/modpackinstaller/ModpackInstaller.java