test
ok
Merge branch 'master' of https://github.com/devEII/DevTest

Conflicts:
	app/views/medias/index.html.erb