fishsticks
Merge branch 'master' of http://github.com/tehalexf/res-ex

Conflicts:
	README.md