12
report

Conflicts:
	report/report.pdf
Merge branch 'master' of https://github.com/weibeld/pervasive_computing