A commit
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/metadata/aa/aaaba4a74d1e4074dbf3e689ae0365c0