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.
reorganized users.js file by category (story rendering, navigation, ajax calls) and minor refactoring
made all fields in the new story form required so empty stories don't end up in the db
Merge branch 'master' into development
commented out unnecessary 'Hello userEmail' from application.html.erb
The new story form's as_a field prepopulates with its parent value
the addStory form's as_a field now automatically depopulates when the user goes back to the dashboard