yolo
Merge branch 'master' of https://github.com/exane/bluePython

Conflicts:
	src/data/buffs.js
Merge branch 'master' of https://github.com/exane/bluePython

Conflicts:
	src/data/buffs.js
Merge pull request #2 from devfake/master

add buffs