third commit: uploaded all project files
Merge branch 'master' of https://github.com/ArthurMoore85/codejournal

Local branch needs to be merged