?
Merge branch 'master' of https://github.com/tinahawlina/APPR-2014-15

Conflicts:
	lib/xml.r
	uvoz/uvoz.r