Initial commit
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/controller/MainControl.js
	app/model/MessageModel.js
	app/view/list/Message.js
	resources/css/my.css
Initial commit
Initial commit