conflict
conflict
Merge branch 'master' of https://github.com/polinankoleva/docmag

Conflicts:
	docmag/src/main/java/bg/unisofia/fmi/docmag/controller/document/PdfController.java
Merge branch 'master' of https://github.com/polinankoleva/docmag
Merge branch 'master' of https://github.com/polinankoleva/docmag
Merge branch 'master' of https://github.com/polinankoleva/docmag
partially implemented the login functionality
partially implemented the login functionality