Merge branch 'master' of https://github.com/kuuba/resup

Conflicts:
	.gitignore
	README.md
Merge branch 'master' of https://github.com/kuuba/resup