Merge branch 'master' of https://github.com/hebbe1234/MTM

Conflicts:
	MTM.iws
	run/logs/2014-09-15-1.log.gz
	run/logs/2014-09-15-2.log.gz
	run/logs/fml-client-1.log
	run/logs/fml-client-2.log
	run/logs/fml-client-3.log
	run/logs/fml-client-latest.log
	run/logs/fml-junk-earlystartup.log
	run/logs/latest.log
	run/saves/Dev world/region/r.-1.0.mca
	run/saves/Dev world/region/r.0.-1.mca
	run/saves/Dev world/region/r.0.0.mca
	run/saves/Dev world/session.lock
	run/saves/Dev world/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json

Merge branch 'master' of
https://github.com/hebbe1234/MTM

Conflicts:
	MTM.iws
	run/logs/2014-09-15-1.log.gz
	run/logs/2014-09-15-2.log.gz
	run/logs/fml-client-1.log
	run/logs/fml-client-2.log
	run/logs/fml-client-3.log
	run/logs/fml-client-latest.log
	run/logs/fml-junk-earlystartup.log
	run/logs/latest.log
	run/saves/Dev
world/region/r.-1.0.mca
	run/saves/Dev
world/region/r.0.-1.mca
	run/saves/Dev
world/region/r.0.0.mca
	run/saves/Dev world/session.lock
	run/saves/Dev
world/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json

Merge remote-tracking branch
'origin/master'

Conflicts:
	MTM.iws
	run/logs/2014-09-15-1.log.gz
	run/logs/2014-09-15-2.log.gz
	run/logs/fml-client-1.log
	run/logs/fml-client-2.log
	run/logs/fml-client-3.log
	run/logs/fml-client-latest.log
	run/logs/fml-junk-earlystartup.log
	run/logs/latest.log
	run/saves/Dev
world/level.dat
	run/saves/Dev world/level.dat_old
	run/saves/Dev
world/playerdata/040a63f0-e153-3f49-84a8-b60ca564e69f.dat
	run/saves/Dev
world/region/r.-1.0.mca
	run/saves/Dev
world/region/r.0.-1.mca
	run/saves/Dev
world/region/r.0.0.mca
	run/saves/Dev world/session.lock
	run/saves/Dev
world/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json

Merge remote-tracking branch
'origin/master'

Conflicts:
	MTM.iws
	run/logs/2014-09-15-1.log.gz
	run/logs/2014-09-15-2.log.gz
	run/logs/fml-client-1.log
	run/logs/fml-client-2.log
	run/logs/fml-client-3.log
	run/logs/fml-client-latest.log
	run/logs/fml-junk-earlystartup.log
	run/logs/latest.log
	run/saves/Dev
world/level.dat
	run/saves/Dev world/level.dat_old
	run/saves/Dev
world/playerdata/040a63f0-e153-3f49-84a8-b60ca564e69f.dat
	run/saves/Dev
world/region/r.-1.0.mca
	run/saves/Dev
world/region/r.0.-1.mca
	run/saves/Dev
world/region/r.0.0.mca
	run/saves/Dev world/session.lock
	run/saves/Dev
world/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json

Furnaaaaace
Merge remote-tracking branch 'origin/master'