shit gitignore
Merge branch 'master' of github.com:Rudeg/DB-Labs

Conflicts:
	Lab 5/Source/target/Lab5-db/WEB-INF/resources/js/script.js