resolving git
Merge branch 'master' of https://github.com/cronon/SmartReserve
resolve git
resolve git
resolve git
resolve git
resolve git