fixing the conflicts
Merge branch 'master' of ssh://github.com/tommyadey/aries
changed stories in home controller