Merge branch 'update'
Merge branch 'update'
Merge branch 'update'
Title change
Merge branch 'update'

Conflicts:
	README.md
Merged
Merge branch 'update'
File moves
Merge branch 'master' into update