a
Merge branch 'master' of https://github.com/Artoria/Side

Conflicts:
	.side/message.txt
Hello
Hello