Commit before trying to merge.
Merge branch 'master' of github.com:marcusnielsen/emma-scoresheet

Conflicts:
	.c9/metadata/tab1
	.c9/metadata/tab28
	.c9/metadata/workspace/server/server.js