asd
Merge branch 'master' of https://github.com/kankoli/to-do-manager.git

Conflicts:
	todo_53V3N/config.properties