erasing conflicting "build_log" file
adding random temp files
adding .bak and .build_log.htm to ignore list
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.uvopt
	examples/boards/ek-tm4c1294xl-boost-cc3000/cc3000_basic_wifi_application/rvmdk/cc3000_basic_wifi_application.build_log.htm