Renamed some files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README
Renamed some files.