Change root path
Merge branch 'master' of https://github.com/runkmc/filmgrain

Conflicts:
	config/routes.rb