First real Commit
Merge branch 'master' of https://github.com/nicosio2/MineFluence

Conflicts:
	logs/fml-client-1.log
	logs/fml-client-latest.log
	logs/fml-junk-earlystartup.log
	logs/latest.log