// this is an update
Merge branch 'master' of https://github.com/Mr-Wallet/ISTA301_FinalProject

Conflicts:
	src/model/RhymeCopy.java