Needed tzinfo for Windows and commented out unicorn gem
Ignoring .idea
Merge branch 'upstream'

Conflicts:
	.gitignore
	Gemfile
Fixed CSS content page margin
Commented out autoprefixer-rails gem
Added Tags to the project
Added recent tags

Is not the most efficient, sql is needed in order to make it scalable.
Added tag transmission from server to client
Merge branch 'feat/tags' into dev
lemme pull!
who cares
try pushing
Added Tests for templates
Removed Idea stuff again
Ignoring .idea
Fixed CSS content page margin
Commented out autoprefixer-rails gem
prettied up the add media form
Fixed router view binding

The the views were never dealloced, so deleting tried to delete already
deleted items.
Merge branch 'bugfix/DeleteMedium' into dev