glemfile.lock update
added s3 file
minor change
remove sample image
remove sample image
Merge branch 'master' of github.com:smondal/koresol

Conflicts:
	app/controllers/videos_controller.rb
layout update