working on creating a story
reorganized JS files and added in user home page
Merge branch 'master' into creating-story
fixing merge conflicts