Commiting changes before merging with online
One last change before mergining with online repository
Added files from online repository
finished merging, quick cleanup changes. Merge includes fixing a bug in cc3000_event.cpp