Entry addtodb korjattu
ignore
yhdistelyt

...
SFTP

Tiedostojen lähettäminen verkkolevylle SFTP:llä
Merge branch 'devel' of https://github.com/spjass/Brojekti into spjass-devel

Conflicts:
	application/src/Entry.java
	application/src/EntryUI.java
	application/src/Main.java
	application/src/SingleEntry.java
Merge branch 'spjass-devel' into devel

Conflicts:
	application/src/Entry.class
	application/src/EntryUI.java
	application/src/Main.java
	application/src/SingleEntry.java