add node_modules on gitignore
Merge branch 'master' of github.com:wagnermoschini/fluor

Conflicts:
	.gitignore
fix gitgnore
Merge branch 'master' of github.com:wagnermoschini/fluor
update gitignore