modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/jquery-1.10.2.js
	new file:   app/assets/javascripts/jquery-ui-1.10.4.custom.js
	new file:   app/assets/javascripts/jquery-ui-1.10.4.custom.min.js
	modified:   app/assets/stylesheets/custom.css.scss
	modified:   app/views/layouts/application.html.erb
	new file:   public/assets/application-34d56a66d7cbd3d570b3e81401062187.css
	new file:   public/assets/application-34d56a66d7cbd3d570b3e81401062187.css.gz
	new file:   public/assets/application-a0eb8cc82f5a451286082da3b5ff172c.js
	new file:   public/assets/application-a0eb8cc82f5a451286082da3b5ff172c.js.gz
	modified:   public/assets/manifest-cb2389618f321b684ad380b08d8a316f.json
Merge branch 'master' of github.com:crowdpublishtv/alpha