Add usernames of people who have commited
Merge branch 'master' of github.com:lbain/cs101

Conflicts:
	README.md