modify makefile
Merge branch 'master' into dev_birl

Conflicts:
	glassball
	makefile
modify makefile
modify
modify makefile
Merge branch 'dev_birl' of github.com:Enyruas/glassball into dev_birl

Conflicts:
	glassball
	makefile
continue merge