Update names
Merge remote-tracking branch 'origin/master'

Conflicts:
	names.txt
Merge branch 'master' of https://github.com/Darya-/15-313-rec-1-a

Conflicts:
	names.txt