adds empty APP controller
adds working controller for APP TESTING
Merge remote-tracking branch 'origin/master'
adds working controller for APP TESTING
adds working controller for APP TESTING
adds working controller for APP TESTING
fixes merge conflict
adds controller for app, adds ratings, category, discounts on main page