Merge pull request #11 from bamiano/master

corrected locations model
rspec 1st test passing
conflicts resolved - view everything favorite working
Merge pull request #12 from lalogf/master

conflicts resolved - view everything favorite working
updated rspec
conflicts resolved for dusk nov 20
added items table and debugged