some minor changes
Merge branch 'master' of https://github.com/anetaaneta/kupakupa
kupakupa with gamma distribution copleted!
Merge branch 'master' of https://github.com/anetaaneta/kupakupa

Conflicts:
	kupa-gui-2/kupa-gui-2.pro.user
add error model for upload
add parsing xml for error rate and error model
Merge branch 'master' of https://github.com/anetaaneta/kupakupa

Conflicts:
	kupa-gui-2/kupa-gui-2.pro.user
	kupakupa.cc
	kupakupa.cc~
	parseXml.cpp
	parseXml.cpp~
	parseXml.h