Working keypad function  working on main
Merge remote-tracking branch 'origin/Jack' into temp

Conflicts:
	Lab2.c
	keypad.c

32-bit timer set using 4&5