first commit
README.md
Merge branch 'master' of github.com:etaypere/resors

Conflicts:
	.gitignore
	README.md