Modified README.md again (testing)
Edit README.md
Edit README again
Update README.md
UGH
Update README.md
um
Re-doing README
READMEEEE
This is Jenn.
Trying to push
Merge branch 'master' of https://github.com/jennwu/Diversity
merging conflict correction
Merge pull request #4 from ashleyjihye4/master

Edited README file
murging Caroline conflict
Added the Puzzle class
Adding User.java class, incomplete but general idea, to discuss