mothng
Merge branch 'master' of https://github.com/cho3ek/UI

Conflicts:
	report/report.docx