Merge branch 'master' of https://github.com/Nyghtprowler/Nyghtmod

Conflicts:
	eclipse/logs/fml-client-1.log
	eclipse/logs/fml-client-2.log
	eclipse/logs/fml-client-3.log
	eclipse/logs/fml-client-latest.log
	eclipse/logs/fml-junk-earlystartup.log
	eclipse/logs/latest.log
Merge branch 'master' of https://github.com/Nyghtprowler/Nyghtmod

Conflicts:
	eclipse/logs/fml-client-1.log
	eclipse/logs/fml-client-2.log
	eclipse/logs/fml-client-3.log
	eclipse/logs/fml-client-latest.log
	eclipse/logs/fml-junk-earlystartup.log
	eclipse/logs/latest.log
Merge branch 'master' of https://github.com/Nyghtprowler/Nyghtmod

Conflicts:
	eclipse/logs/fml-client-1.log
	eclipse/logs/fml-client-2.log
	eclipse/logs/fml-client-3.log
	eclipse/logs/fml-client-latest.log
	eclipse/logs/fml-junk-earlystartup.log
	eclipse/logs/latest.log
changes
new
new
new
new