Heroku shenanigans
Heroku shenanigans part 2: Electric Boogaloo
Heroku shenanigans part 2: Electric Boogaloo
assets are a pain
Heroku shenanigans part 2: Electric Boogaloo
asseeeets
Heroku shenanigans part 3: I don't even know
Heroku shenanigans part 3: I don't even know
Heroku shenanigans part 3: I don't even know
Heroku shenanigans part 3: I don't even know
Merge branch 'master' into master2

Conflicts:
	Gemfile