Edit README.md
Edit README again
UGH
Update README.md
um
Re-doing README
READMEEEE
Update README.md
merging conflict correction
Merge pull request #4 from ashleyjihye4/master

Edited README file
murging Caroline conflict
Added the Puzzle class
merge
merge
Adding User.java class, incomplete but general idea, to discuss
Sorry, this is the right file, the other one was just notes. Now merging User.java class
Update User.java
reverting jenn.txt
Delete User.java
Update User.java

Adding newline at end