I'm trying out Git for the first time. -RO
Merge pull request #6 from tommyschnabel/Kenny

I added a sentence to the text document
I'm trying out Git for the first time. -RO
Fixed merge conflicts - ro
Fixing conflicts - RO
Merge pull request #7 from tommyschnabel/Roger

Roger
yuyang made some changes
Merge pull request #8 from tommyschnabel/Yu

yuyang made some changes
Fixed permissions for Unix build scripts
Added Reservations Module. Working on getting it to work with Jersey to look for client requests
Merge pull request #9 from tommyschnabel/Tommy

Tommy
Still trying to get Jersey to work
Always give a good commit message!
Merge pull request #10 from tommyschnabel/Alex

Always give a good commit message!
Configured Jersey. Also took the dependencies out of the repo, they are now downloaded remotely from Maven Central
Merge pull request #11 from tommyschnabel/Tommy

Tommy
Fixed Eclipse buildpaths and changed package names
Merge pull request #12 from tommyschnabel/Tommy

Fixed Eclipse buildpaths and changed package names
Editing the text file.
Editing the txt file