added name to team members' list
Merge branch 'master' of https://github.com/juliebert/meowmeow

Conflicts:
	README.md
fixing merge conflict