solving conflicts.
solving conflicts:
	sklepInternetowy.dbs
deleted unnecessary table.

Conflicts:
	sklepInternetowy.dbs
Added backend for shop administrator in database.

Conflicts:
	sklepInternetowy.dbs
Merge branch 'master' of https://github.com/Zixxy/Online-shop

Conflicts:
	sklepInternetowy.dbs