merge improiving-search
Merge branch 'master' of https://github.com/jccf091/myflix

Conflicts:
	app/views/shared/_header.html.haml
Merge branch 'master' of https://github.com/jccf091/myflix
edit unicorn configure
specify ruby version
debug video controller and moving root page logic into  pages controller
Merge pull request #10 from jccf091/refactoring

Refactoring