Carrierwave and fog installed no issue
All tests passing. Db migrations completed
Uploaders created. Initialiser installed
New video form working
All tests passing
carrier wave added. All test passing. Uploading to staging for test
Changed fog preference
Merge remote-tracking branch 'origin/carrierwave_setup'

Conflicts:
	Gemfile
	app/views/admin/videos/new.html.haml