Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
startet implementing fileService
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup

Conflicts:
	pieShareApp/src/main/java/org/pieShare/pieShareApp/controller/PieShareController.java