The final Version.
Merge branch 'master' of github.com:sddhrthrt/graffiti

Conflicts:
	trunk/a.out
	trunk/basic
	trunk/basic.cpp
	trunk/classes.h
	trunk/data/.svn/entries
	trunk/html/.svn/entries
	trunk/html/.svn/text-base/Mainpage_8h_source.html.svn-base
	trunk/html/.svn/text-base/annotated.html.svn-base
	trunk/html/.svn/text-base/classCircle-members.html.svn-base
	trunk/html/.svn/text-base/classCircle.html.svn-base
	trunk/html/.svn/text-base/classColor-members.html.svn-base
	trunk/html/.svn/text-base/classColor.html.svn-base
	trunk/html/.svn/text-base/classLine-members.html.svn-base
	trunk/html/.svn/text-base/classLine.html.svn-base
	trunk/html/.svn/text-base/classOperations-members.html.svn-base
	trunk/html/.svn/text-base/classOperations.html.svn-base
	trunk/html/.svn/text-base/classPoint-members.html.svn-base
	trunk/html/.svn/text-base/classPoint.html.svn-base
	trunk/html/.svn/text-base/classdatareader-members.html.svn-base
	trunk/html/.svn/text-base/classdatareader.html.svn-base
	trunk/html/.svn/text-base/classes.html.svn-base
	trunk/html/.svn/text-base/classes_8h.html.svn-base
	trunk/html/.svn/text-base/classes_8h_source.html.svn-base
	trunk/html/.svn/text-base/files.html.svn-base
	trunk/html/.svn/text-base/functions.html.svn-base
	trunk/html/.svn/text-base/functions_func.html.svn-base
	trunk/html/.svn/text-base/functions_vars.html.svn-base
	trunk/html/.svn/text-base/index.html.svn-base
	trunk/html/Mainpage_8h_source.html
	trunk/html/annotated.html
	trunk/html/classCircle-members.html
	trunk/html/classCircle.html
	trunk/html/classColor-members.html
	trunk/html/classColor.html
	trunk/html/classLine-members.html
	trunk/html/classLine.html
	trunk/html/classOperations-members.html
	trunk/html/classOperations.html
	trunk/html/classPoint-members.html
	trunk/html/classPoint.html
	trunk/html/classdatareader-members.html
	trunk/html/classdatareader.html
	trunk/html/classes.html
	trunk/html/classes_8h.html
	trunk/html/classes_8h_source.html
	trunk/html/files.html
	trunk/html/functions.html
	trunk/html/functions_func.html
	trunk/html/functions_vars.html
	trunk/html/index.html
	trunk/html/search/.svn/entries
	trunk/html/search/.svn/text-base/all_62.html.svn-base
	trunk/html/search/.svn/text-base/all_63.html.svn-base
	trunk/html/search/.svn/text-base/all_64.html.svn-base
	trunk/html/search/.svn/text-base/all_67.html.svn-base
	trunk/html/search/.svn/text-base/all_69.html.svn-base
	trunk/html/search/.svn/text-base/all_6c.html.svn-base
	trunk/html/search/.svn/text-base/all_6d.html.svn-base
	trunk/html/search/.svn/text-base/all_70.html.svn-base
	trunk/html/search/.svn/text-base/all_73.html.svn-base
	trunk/html/search/.svn/text-base/all_78.html.svn-base
	trunk/html/search/.svn/text-base/classes_67.html.svn-base
	trunk/html/search/.svn/text-base/classes_70.html.svn-base
	trunk/html/search/.svn/text-base/functions_62.html.svn-base
	trunk/html/search/.svn/text-base/functions_63.html.svn-base
	trunk/html/search/.svn/text-base/functions_64.html.svn-base
	trunk/html/search/.svn/text-base/functions_67.html.svn-base
	trunk/html/search/.svn/text-base/functions_69.html.svn-base
	trunk/html/search/.svn/text-base/functions_6c.html.svn-base
	trunk/html/search/.svn/text-base/functions_6d.html.svn-base
	trunk/html/search/.svn/text-base/functions_70.html.svn-base
	trunk/html/search/.svn/text-base/functions_73.html.svn-base
	trunk/html/search/.svn/text-base/search.js.svn-base
	trunk/html/search/.svn/text-base/variables_78.html.svn-base
	trunk/html/search/all_64.html
	trunk/html/search/all_67.html
	trunk/html/search/functions_67.html
	trunk/html/search/search.js
	trunk/latex/.svn/entries
	trunk/latex/.svn/text-base/annotated.tex.svn-base
	trunk/latex/.svn/text-base/classCircle.tex.svn-base
	trunk/latex/.svn/text-base/classColor.tex.svn-base
	trunk/latex/.svn/text-base/classLine.tex.svn-base
	trunk/latex/.svn/text-base/classOperations.tex.svn-base
	trunk/latex/.svn/text-base/classPoint.tex.svn-base
	trunk/latex/.svn/text-base/classdatareader.tex.svn-base
	trunk/latex/.svn/text-base/classes_8h.tex.svn-base
	trunk/latex/.svn/text-base/doxygen.sty.svn-base
	trunk/latex/.svn/text-base/refman.tex.svn-base
	trunk/latex/annotated.tex
	trunk/latex/classdatareader.tex
	trunk/latex/classes_8h.tex
	trunk/latex/doxygen.sty
	trunk/latex/refman.tex