File changes made by Alan
Merge pull request #24 from candaya/master

updated skeleton .cc
Update file_parser.h
Revert "File changes made by Alan"

This reverts commit 57db446b986e8d03466a6e3107d31ac7417f18b2.
Merge pull request #26 from Ricky1833/master

reverting my changes
Merge pull request #3 from IanJRigg/master

getting latest
Made changes per Riggins instruction
Merge pull request #27 from Ricky1833/master

adding changes made to .cc and .h
Merge pull request #8 from IanJRigg/master

getting Riggins updates