laptop: muckup on line 15
laptop: modification on master branch; same area of modification as
badbranch
Fixed merge conflicts.

Merge branch 'master' of
https://github.com/Flawkes/StockWatcherByFlawkes.git

Conflicts:
	src/META-INF/jdoconfig.xml