Merge tests
Merge branch 'master' of https://github.com/etnbrd/flx-compiler

Conflicts:
	test/test.js
Merge pull request #10 from blackheaven/master

Merge tests