removed hello_ouch.bin
Replaced tabs with 8 spaces in remaining files
Fixed conflict ccntlv merge
Implemented CCNx 1.0 spec