test commit again for remote branch
Fixed problems so that all the current (5) tests pass
Merge remote-tracking branch 'upstream/present-nov19' into present2

Conflicts:
	app/tests/artist.server.model.test.js
Updated tests to check that all are passing properly. Ready to present, but will try to add more tests.
Increased size of watched artists text by changing table properties and added some more tests, but need to make more complicated ones.
Merge pull request #5 from Shmiddy/present2

Present2 - didn't code review...