Commit 1
Merge branch 'master' of https://github.com/spencerwi/OpenSale

Conflicts:
	README.md