adding functions
Merge branch 'master' of https://github.com/ervanux/doING

Conflicts:
	doING/DBManager.h
	doING/DBManager.m