MVP working
Merge branch 'master' into testing-backend

Conflicts:
	view.rb
Merge pull request #6 from JacobKorn/testing-backend

Testing backend