Merges part 2
Merge part 2 cont
Merge branch 'conflict'

Conflicts:
	readme.md