merge
Merge branch 'beta' into robert
Added hiding functionality
Merge branch 'robert' into beta
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
dumm bug
Merge branch 'beta' of github.com:CloudClown/Flint into beta
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
userlist
getLevel update
Merge branch 'beta' of github.com:CloudClown/Flint into beta

Conflicts:
	app.js
local level
Merged
wellp gg points
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
gg code
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta