# Conflicts:
#	public/css/chat.css
#	public/js/chat-db.js
#	public/js/chat-ui.js
#	public/js/language_en.js
#	public/js/language_ja.js
#	public/js/language_ko.js