Initial Commit
Merge branch 'master' of github.com:nicdaCosta/featurama.js

Conflicts:
	README.md