prep to pull app.js changes
idea testing
fix merge conflicts
Merge branch 'master' of https://github.com/Arielle919/Concert
Merge branch 'master' of https://github.com/Arielle919/Concert
Merge branch 'master' of https://github.com/Arielle919/Concert
Merge branch 'master' of https://github.com/Arielle919/Concert
minor fn  name change