Iframe Bootstrap corrected
Merge conflicts removed
Iframe inserted with Url and Title #17
Merge branch 'master' of screamout

Conflicts:
	app/assets/javascripts/screamout.js.coffee
	app/assets/stylesheets/screamout.css
	app/controllers/iframe_contents_controller.rb