commit before merging with eugene
Merge branch 'ellie_friday2b' of https://github.com/newenegue/peek_frontend into eugene