fixed git merge conflict
Merge branch 'development' of github.com:corporadobob/WDI_User_Story_Project into development
Merge branch 'development' of github.com:corporadobob/WDI_User_Story_Project into development
fixed merge conflicts in welcome.js
Merge branch 'development' of github.com:corporadobob/WDI_User_Story_Project into development
fixed merge conflicts
Merge branch 'development' of github.com:corporadobob/WDI_User_Story_Project into development
made input fields required in the story submit page.