db
Merge branch 'master' of https://github.com/anvish/MyDayLog

Conflicts:
	src/com/example/smp2/DbHelper.java