fix migrations
Merge remote-tracking branch 'upstream/master'
	deleted:    db/migrate/20140529062057_add_subdomain_to_sites.rb
	deleted:    db/migrate/20140529062220_add_site_to_posts.rb
	deleted:    vendor/assets/javascripts/.keep
	deleted:    vendor/assets/javascripts/bootstrap.js
	deleted:    vendor/assets/javascripts/bootstrap.min.js
	deleted:    vendor/assets/javascripts/holder.js
	deleted:    vendor/assets/javascripts/html5shiv.js
	deleted:    vendor/assets/javascripts/jquery-1.10.2.min.js
	deleted:    vendor/assets/javascripts/jquery.mixitup.min.js
	deleted:    vendor/assets/javascripts/modernizr.custom.js
	deleted:    vendor/assets/javascripts/respond.min.js
	deleted:    vendor/assets/javascripts/syntax/shAutoloader.js
	deleted:    vendor/assets/javascripts/syntax/shBrushAS3.js
	deleted:    vendor/assets/javascripts/syntax/shBrushAppleScript.js
	deleted:    vendor/assets/javascripts/syntax/shBrushBash.js
	deleted:    vendor/assets/javascripts/syntax/shBrushCSharp.js
	deleted:    vendor/assets/javascripts/syntax/shBrushColdFusion.js
	deleted:    vendor/assets/javascripts/syntax/shBrushCpp.js
	deleted:    vendor/assets/javascripts/syntax/shBrushCss.js
	deleted:    vendor/assets/javascripts/syntax/shBrushDelphi.js
	deleted:    vendor/assets/javascripts/syntax/shBrushDiff.js
	deleted:    vendor/assets/javascripts/syntax/shBrushErlang.js
	deleted:    vendor/assets/javascripts/syntax/shBrushGroovy.js
	deleted:    vendor/assets/javascripts/syntax/shBrushJScript.js
	deleted:    vendor/assets/javascripts/syntax/shBrushJava.js
	deleted:    vendor/assets/javascripts/syntax/shBrushJavaFX.js
	deleted:    vendor/assets/javascripts/syntax/shBrushPerl.js
	deleted:    vendor/assets/javascripts/syntax/shBrushPhp.js
	deleted:    vendor/assets/javascripts/syntax/shBrushPlain.js
	deleted:    vendor/assets/javascripts/syntax/shBrushPowerShell.js
	deleted:    vendor/assets/javascripts/syntax/shBrushPython.js
	deleted:    vendor/assets/javascripts/syntax/shBrushRuby.js
	deleted:    vendor/assets/javascripts/syntax/shBrushSass.js
	deleted:    vendor/assets/javascripts/syntax/shBrushScala.js
	deleted:    vendor/assets/javascripts/syntax/shBrushSql.js
	deleted:    vendor/assets/javascripts/syntax/shBrushVb.js
	deleted:    vendor/assets/javascripts/syntax/shBrushXml.js
	deleted:    vendor/assets/javascripts/syntax/shCore.js
	deleted:    vendor/assets/javascripts/syntax/shLegacy.js
	deleted:    vendor/assets/javascripts/toucheffects.js
	deleted:    vendor/assets/javascripts/transicion.js
	deleted:    vendor/assets/stylesheets/.keep
	deleted:    vendor/assets/stylesheets/animate.min.css
	deleted:    vendor/assets/stylesheets/animations.css
	deleted:    vendor/assets/stylesheets/bootstrap-theme.css
	deleted:    vendor/assets/stylesheets/bootstrap-theme.min.css
	deleted:    vendor/assets/stylesheets/bootstrap.css
	deleted:    vendor/assets/stylesheets/bootstrap.min.css
	deleted:    vendor/assets/stylesheets/component.css
	deleted:    vendor/assets/stylesheets/default.css
	deleted:    vendor/assets/stylesheets/font-awesome-ie7.css
	deleted:    vendor/assets/stylesheets/font-awesome-ie7.min.css
	deleted:    vendor/assets/stylesheets/font-awesome.css
	deleted:    vendor/assets/stylesheets/font-awesome.min.css
	deleted:    vendor/assets/stylesheets/robotic-theme.css
	deleted:    vendor/assets/stylesheets/style.css
	deleted:    vendor/assets/stylesheets/syntax/ie.css
	deleted:    vendor/assets/stylesheets/syntax/shCore.css
	deleted:    vendor/assets/stylesheets/syntax/shCoreDefault.css
	deleted:    vendor/assets/stylesheets/syntax/shThemeDefault.css
Merge remote-tracking branch 'upstream/master'
push commit