Lab 2 completed
Merge branch 'develop' of https://github.com/mureyalunatorres/UAECE372-Team6 into develop

Conflicts:
	Lab2/keypad.c
	Lab2/lab2.c
	Lab2/lcd.c