adding api
Merge branch 'master' of https://github.com/lxdiyun/itlog

Conflicts:
	views.py