committing conflict with c9 metadata file
Merge branch 'master' of https://github.com/amymacims/LearningJavaScript