Merge pull request #1 from FiniteZ/master

Row Flash
Divided up the project into client and server and added RMI