!
Merge branch 'master' of https://github.com/RichardSimko/ETSF01

Conflicts:
	database.csv
	project.csv
	src/datastructure/Project.java