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

Conflicts:
	app/static/app/css/style.css