dev
Merge branch 'master' of https://github.com/FlamesoFF/flamedJS.git