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

Conflicts:
	keypad.c
Lab2, Part1 - MN Keypad.c
Merge branch 'MikeDev' of https://github.com/mcomeau1/Lab2

Conflicts:
	keypad.c