Boof! UML changes!
Merge remote-tracking branch 'origin/master'

Conflicts:
	UMLimage/UML Revision 3.dia
	UMLimage/UML Revision 3.dia~
Merge branch 'master' of https://github.com/CMPUT301F14T11/TEAMLORT

Conflicts:
	UMLimage/UML Revision 3.dia