lagt till int
Merge branch 'master' of https://github.com/Elmseld/sjuan

Conflicts:
	DataBase.java