Merge pull request #4 from dembins3/master

TESTING SHITE
At bug -.-
Removing project files made from rubymine
Merge branch 'AddMedium'

This is the current state as of the Sprint 1 demo
Adding template tests, and updated Gemfile
Merge branch 'master' of http://github.com/felgenh3/Market

Conflicts:
	.idea/Market ST.iml
	Gemfile.lock