1
Merge branch 'master' of https://github.com/tppalani/one

Conflicts:
	New Text Document.txt