Users seem to be working.
Fix merge.
Added markets.
Associateing a user with a market.
Merge pull request #5 from roggenkamps/steve_004

Steve 004