Comments in main.cpp done
Adding authors and date to the comments of main.cpp
Comments in Data.h done
Modifying Type::addParents()
Comments in scanner/lexer done
Comments in Data.cpp done
Updating readme
Fixing some bugs in data.cpp
Merging branch master : fixing conflicts in main.cpp and Data.cpp