we've started skeleton!
Fixed strange merge problems, added things to Users to be compatible …
Merge commit 'origin/master'
Added fields to "create users"
Created "Things", an entry for each hListing and added .gitignore file.
Skeleton for users, data input, and data sorting
del'd dupe files
moved camo's drawings to diagrams/