Merge branch 'master' of https://github.com/wkimeria/rack-attack

Conflicts:
	README.md
Merge branch 'master' of https://github.com/wkimeria/rack-attack