modified:   README.md
	modified:   README.md
Merge branch 'master' of https://github.com/eschmuck/circle

Conflicts:
	.c9/metadata/tab0
	.c9/metadata/workspace/README.md

	deleted:    .c9/.nakignore
	modified:   .c9/metadata/tab0
	deleted:    .c9/metadata/tab1
	deleted:    .c9/metadata/workspace/NewFile.js
	deleted:    .c9/project.settings