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.
Merge pull request #9 from BillytheMagicToilet/Spencer

Spencer