user orders almost complete
merge fix
Merge pull request #35 from lkania/user_orders

user orders almost complete