updated
Merge branch 'master' of https://github.com/timothykoh/dogechat

Conflicts:
	db.sqlite3
updated