Update file_parser.cc
Update file_parser.h
Update file_parse_exception.h
Update Makefile
Update file_parser.h
Rich's fixes to the files
Cleaned up code, added submethods, removed extraneous variables
Hope this fixed the merge issue
Merge pull request #36 from Ricky1833/master

Finally fixed it!
Merge pull request #10 from IanJRigg/master

pulling the latest code