hello
Merge pull request #1 from evancf/alice_changes

hello