Initial commit
final project as of 11/11/2014
Merge remote-tracking branch 'origin/master'
more implementation
changes
Merge branch 'chavolla' of https://github.com/urielgarcia/Final

Conflicts:
	ADC.c
	ADC.h
	lab3.c
	lcd.c