Merge pull request #3 from LB--/master

Start implementing Restaurant.java, clean up other files
Merge pull request #4 from LB--/master

Fix errors from #3
Merge remote-tracking branch 'upstream/master'