Merge branch 'MikeDev' of https://github.com/mcomeau1/Lab2 into NicolasBranch

Conflicts:
	keypad.c
no message
Merge branch 'MikeDev' of https://github.com/mcomeau1/Lab2 into NicolasBranch

Conflicts:
	keypad.c
RB9 to RB5
Merge branch 'MikeDev' of https://github.com/mcomeau1/Lab2 into NicolasBranch
Merge branch 'MikeDev' of https://github.com/mcomeau1/Lab2 into NicolasBranch
Merge branch 'MikeDev' of https://github.com/mcomeau1/Lab2 into NicolasBranch
Lab2, Part2 - More changes to Lab2.c rough draft