fixed merge conflict
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   app/js/app.js