stuff
Merge branch 'master' of github.com:teameax/FlowFreeax
deleted file
Merge branch 'master' of github.com:teameax/FlowFreeax
bubble class
fixed conflicts