added new backup 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_cc3000_basic_wifi_application.dep
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/board.o
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000_basic_wifi_application.build_log.htm
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000_basic_wifi_application.crf
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000_basic_wifi_application.htm
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000_basic_wifi_application.o
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000lib.o
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cmdline.o
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/pwm_10-30.o
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/uartstdio.o
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/ustdlib.o