lots
almost done
db dump
move db dump
Remove the now ignored directory "some-directory"
re-add public
remove uploloads
something
Merge branch 'bleed' of github.com:OxygenProductions/msy into bleed

Conflicts:
	app/admin/slideshow.rb
	app/admin/workshop.rb
	app/assets/stylesheets/zapp_slideshow.css.scss
	app/assets/stylesheets/zapp_style.css.scss
	app/assets/stylesheets/zapp_video.css.scss
	app/controllers/audios_controller.rb
	app/controllers/classes_controller.rb
	app/controllers/pages_controller.rb
	app/controllers/slideshows_controller.rb
	app/controllers/videos_controller.rb
	app/controllers/workshops_controller.rb
	app/helpers/application_helper.rb
	app/models/audio.rb
	app/models/slideshow.rb
	app/models/video.rb
	app/views/applies/new.html.erb
	app/views/audios/_list.html.erb
	app/views/audios/index.html.erb
	app/views/audios/show.html.erb
	app/views/classes/index.html.erb
	app/views/classes/newtoyoga.html.erb
	app/views/classes/scyoga.html.erb
	app/views/contacts/new.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/full.html.erb
	app/views/layouts/left.html.erb
	app/views/pages/resources.html.erb
	app/views/pages/ytt.html.erb
	app/views/pages/ytt200.html.erb
	app/views/pages/ytt500.html.erb
	app/views/pages/yttapply.html.erb
	app/views/pages/yttdepth.html.erb
	app/views/pages/yttfaq.html.erb
	app/views/pages/yttreg.html.erb
	app/views/pages/yttsay.html.erb
	app/views/readings/index.html.erb
	app/views/slideshows/_list.html.erb
	app/views/slideshows/index.html.erb
	app/views/slideshows/show.html.erb
	app/views/videos/_list.html.erb
	app/views/videos/index.html.erb
	app/views/videos/show.html.erb
	app/views/workshops/book.html.erb
	app/views/workshops/index.html.erb
	app/views/workshops/show.html.erb
	app/views/workshops/topics.html.erb
	config/initializers/carrierwave_backgrounder.rb
	config/routes.rb
	db/schema.rb