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
Hope this fixed the merge issue