changed to memberVariables
Merge branch 'master' of https://github.com/cakelake/FireFly

Conflicts:
	FireFly/FireFly/Mal.cpp
	FireFly/FireFly/Player.cpp
Merge branch 'master' of https://github.com/cakelake/FireFly