collaborator added one line.
fixed merge conflict.
collaborator added one line.
Merge branch 'dev' of https://github.com/joannahwang/rebasetest into dev
updated from upstream.
collaborator added another line.
fork changed first line and added one line.
fixed conflict.
Merge pull request #2 from joannahwang/dev

Dev