coommit the talk code
merge the code
enable debug
the second code
the seecond merge
merge for the third time
Merge remote branch 'hello/master'

Conflicts:
	Gulpfile.js
	assets/css/jobs.css
	assets/css/talk.css
	assets/js/jobs.js
	assets/js/login.js
	assets/js/talk.js
	backend/models.py
	baidu/settings.py
	base/decorators.py
	base/js/login.js
	base/views.py
	templates/login.html
merge the conflict part
rm the wrong file loggers.py
change the pkgs.js file
modify the sign in message
Merge pull request #54 from lucknessbuaa/master

merge for the first time
提交当前版本
Merge remote branch 'upstream/product'

Conflicts:
	.gitignore
Merge remote branch 'upstream/master'

Conflicts:
	backend/jobs_views.py
	backend/models.py
更改requirement.txt
Merge pull request #55 from hexiaoming/master

提交当前版本
merge
Merge remote branch 'upstream/master' into product
datetimepicker problem