Temporary changes
Merge branch 'master' of github.com:DeusExVerbum/journey_journal
Work done on laptop merge with main computer development