new charts
merging

Merge branch 'master' of github.com:ADIRSE/maddata

Conflicts:
	tests.R