Needed tzinfo for Windows and commented out unicorn gem
Ignoring .idea
Fixed CSS content page margin
Commented out autoprefixer-rails gem
Added template for search
Removed unused model classes
Added some simple scopes to Medium
Added certain parameters for searching
Removed csrf for searching
Added recent flag in searching
Merge branch 'feat/search' into dev
tzinfo was in the gemfile twice, likely from both erick227 and I adding it.

Got rid of some whitespaces in medium.rb that were causing syntax errors about unexpected parenthesis

Merge branch 'master' of http://github.com/felgenh3/Market

Conflicts:
	Gemfile
	Gemfile.lock