push
Merge branch 'master' of github.com:Isht/apotek

Conflicts:
	assets/apotekdb.sql.zip