test for adding a line
add another line
Merge branch 'artist' into develop

Conflicts:
	README.md
Complete initial layout of Chat room,
Adding specific folders to put externel js/css files.
Merge branch 'chatroom' into develop
Delete css/js file where in the wrong folder
modify index & memberadmin