Application_controller file is proper
Merge branch 'master' of https://github.com/prohel/Tripster