Minor edit
Merge remote-tracking branch 'upstream/master'
versioningInit()
Merge branch 'master' of https://github.com/ParthKolekar/todo into ParthKolekar-master

Conflicts:
	bash_completion/todo
	src/main.cpp
Merge branch 'ParthKolekar-master'