Add UI.
Update UI.
conflict creation
second conflict
Merge branch 'feature-ui-conflict' into feature-ui

Conflicts:
	UI Document.txt
Merge pull request #1 from Codeketeers/feature-ui

Merge UI into master.