a
a
Merge branch 'master' of https://github.com/bcarlos/CalosBrandon_CSC11_48598

Conflicts:
	Class/tempFloat.s
Merge branch 'master' of https://github.com/bcarlos/CalosBrandon_CSC11_48598

Conflicts:
	Class/tempFloat.s