Initial commit
Merge branch 'master' of github.com:catlikethief/auction
Merge branch 'master' into develop