Generated master for commit 47fc046
Author: opotowsky <arrielle.opotowsky@gmail.com>

    updating arrielle's file and main