fixed broken tests
fixed typo in .gitignore
Merge branch 'master' of github.com:umfoida5/comp4350group5

Conflicts:
	src/view/iOS/CardioQuest/._CDQEventsInputController.m