Added data
Merge remote-tracking branch 'origin'

Conflicts:
	cpp/res.cpp