Added all test users, each with unique song lists
Merge branch 'danInitial'
Added some javadoc comments