nothing more then db
Merge branch 'master' of https://github.com/Whynot63/Localchat_beta_Django_server_web_version

Conflicts:
	db