No User
Merge branch 'master' of https://github.com/egs5053/My-Open-Journal

Conflicts:
	workspace/My Open Journal/src/Test/DBManager.java
Merge branch 'master' of https://github.com/egs5053/My-Open-Journal