added new log files
Merge branch 'master' into HASC-dev

Conflicts:
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/cc3000_basic_wifi_application.uvgui.Marc
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/cc3000_basic_wifi_application.uvgui_Marc.bak
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/cc3000_basic_wifi_application.uvopt
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/cc3000_basic_wifi_application_uvopt.bak
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000_basic_wifi_application.build_log.htm
	examples/boards/my_projects/ADC_temperature/ADC_temperature.build_log.htm
added the SS1 for channels 0 and 9 ADC0
added processor triggered ADC0 convertion
correcting IR sensor distance with 5V power
trying timer interrupt...not working
went back to processor triggered version
added delay after initializing port E & ADC0 clock
disabling ADC0 before configuration
eliminated spaces and added .bak to ignore list
adding left and right sensor variables
ADC0_InSeq3() no longer returns...its void
added variable to get difference between sensors
robot will avoid things that are within 60 cm
added logic to turn robot left/right
added a better formula to find distance
added new distance formula. Need to test more
using booleans to avoid send commands over and over
added state booleans
reduced proximity distance to 25 cm