Merge pull request #7 from IanJRigg/master

getting updated files again
updating file_parser, open pull request
Merge pull request #24 from candaya/master

updated skeleton .cc