merge conflict commit.....
Merge branch 'master' of https://github.com/xwhiteknuckle22/LogBook

Conflicts:
	test.cpp