<Auto Generated by Git>

Conflicts:
	index.js
	lib/db.js
	lib/tagloader.js

Signed-off-by: Lee <jessy1092@gmail.com>
Merge branch 'master' of github.com:jessy1092/CommuniqueAPI

Conflicts:
	lib/db.js