Merge branch 'master' of https://github.com/mjelks/fhcs001a
latest changes
pull data
Merge branch 'master' of https://github.com/mjelks/fhcs001a

Conflicts:
	lab2/src/CashRegister/CalculateChange.java
Merge branch 'master' of https://github.com/mjelks/fhcs001a

Conflicts:
	classnotes/class7.md