removed tolua++ makefile which is overwritten by cmake
Add a Bitdeli badge to README
Merge pull request #502 from bitdeli-chef/master

Add a Bitdeli Badge to README
Merge pull request #494 from worktycho/threadsafequeue

refactored the chunk queue into a seperate class
Merge branch 'master' of github.com:mc-server/MCServer

Conflicts:
	lib/tolua++/Makefile