Kusachi San's merge
Merge remote-tracking branch 'upstream/master'
Merge https://github.com/nacarino/ndn-mobility
write header file
fix header file
2nd fix header
Merge https://github.com/nacarino/ndn-mobility
First commit for NNPT & NNPTEntry header files
Merge https://github.com/nacarino/ndn-mobility
modified NNPTEntry
replace wrong file with nacarino's original file
simple structure of NNPT & NNPT Entry
add "add function"
Implement NNPT/NNPTEntry functions
implement NNPT&NNPTEntry, make test file
small fix
complete implementation of NNPT, NNPEEntry and NNPT test
restore nnn-nnst-test.cc
TCP graphing script

Kovi found an error that made it impossible to graph the data rate of TCP/IP using the R scripts we had. I have renamed the prior script to reflect that it is for use only on ICN/NDN data and have added a file to be used for TCP/IP data.
Scripts checking for file type

Kovi's reported error made it necessary to also include code to display more useful error messages if the wrong file format was detected.
Merge branch 'master' of https://github.com/takahiro33/ndn-mobility into takahiro33-master

Conflicts:
	scenarios/nnn-nnst-test.cc

Conflict was minor as it reflected all the changes in nnn-nnst-test.cc done while I was testing the NNST.

Moved all NNPT files into the extensions/nnnSIM/model/nnpt folder to make things a little easier to check.

Also applied GNU coding style to all files given to me by Miyamoto-kun.