Merge Jacob/master

Conflicts:
	src/group_01_3sem/Group_01_3sem.java