* bullet fix
Merge branch 'master' of https://github.com/Vegasq/mash_love_learn
* try merg
Conflicts:
	bj/main.lua