add hello action to application controller
added hello action to application controller
resolving merge conflicts