First version - broken as hell
First version - broken as hell, some stuff for git added
Merge branch 'master' of https://github.com/kuuba/resup

Conflicts:
	.gitignore
	README.md