updated app controller to fix git conflict
updated git conflicts
fix application rb file