Style
Merge branch 'master' of github.com:jgalmeida/jwt-auth

Conflicts:
	README.md