Auto-merging support/curl-examples.md
Auto-merging sbscribe-api/endpoints/session.js
Auto-merging sbscribe-api/app.js
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   Plumbing.js
	modified:   package.json
	modified:   sbscribe-api/app.js
	modified:   sbscribe-api/endpoints/session.js
	modified:   sbscribe-front-end/TODO
	modified:   sbscribe-front-end/app.js
	modified:   sbscribe-front-end/static/js/loader.js
	modified:   sbscribe-front-end/views/app/index.ejs
	modified:   support/curl-examples.md
	modified:   support/import-feeds.js

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	sbscribe-front-end/assets-mapping.json

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (14f5278ab57feda251505b3c98a4aa0e97dbe940) not merging