Merge pull request #8 from BillytheMagicToilet/Spencer

Spencer
Rspec issue
RSPEC stuff
bunch of stuff
Rspec issue
RSPEC stuff
bunch of stuff
Fixed some things from rebase
Merge branch 'Jack' of github.com:BillytheMagicToilet/final_project into Jack

# By saasbook
# Via BillytheMagicToilet (1) and saasbook (1)
* 'Jack' of github.com:BillytheMagicToilet/final_project:
  bunch of stuff
  RSPEC stuff
  Rspec issue

Conflicts:
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
Merge branch 'refs/heads/Jack' into Spencer

* refs/heads/Jack:
  Fixed some things from rebase
  bunch of stuff
  RSPEC stuff
  Rspec issue
  bunch of stuff
  RSPEC stuff
  Rspec issue
Cleaned up files/folders. Started creating dashboard action for users.