update gitignore
Merge remote-tracking branch 'origin/roomMaster' into roomMaster

Conflicts:
	.gitignore
Merge branch 'roomMaster' of https://github.com/Fred07/chatroom into roomMaster
update gitignore