deleted test objects
Merge remote-tracking branch 'upstream/branchtest' into testbranch
removed test files
Merge remote-tracking branch 'upstream/master'
Added Devise and part of Cancan
carouselv1 push
Merge remote-tracking branch 'upstream/homepagecreation' into adding-devise

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb
Fixing CSS
Created all DB models
modify homepage, add cherry street controller and view
Fixing merge issues
Merge pull request #5 from akanpurwala/adding-models

Added devise, cancan, and all db models