Initial commit
GitHub difference test

I deleted "Different!" from the file
First simple commit
Merge branch 'master' of
https://github.com/CelestialStreamer/JournalApp.git

Conflicts:
	src/application/Main.java