twitter images added to assets
Merge branch 'master' of github-marwich:marwich/mmmdummy_frontend

Conflicts:
	config/environments/production.rb