Added the drawOval function. Does not work with redo/undo yet.
Please enter the commit message for your changes. Lines starting
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/fa13/projects/whiteboard/cath_yun-eruleman-kateyu

Conflicts:
	src/canvas/Canvas.java
	src/whiteboard/Freehand.java
Moved the preventRedoAfterThisEdit() method from Canvas to CanvasModel.
Added comments to methods in Canvas.
moved a few things around
merge
moved things to canvas class, makes more sense for them to be there
Added some more comments. No major functionality changes.
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/fa13/projects/whiteboard/cath_yun-eruleman-kateyu
made client, it sort of works now but need to flesh out the functionality. deleted grammar/antlr stuff
merging
made trivial changes to line and oval, maybe they'll show up for you now
fiddled around with some more stuff, added toolbar to the same window as the canvas because it was getting annoying
handling unique usernames/whiteboards, also i think we should delete the username class it seems redundant/unnecessary
fixed canvas so that undo/redos are the correct color
fixed problem in which existing whiteboards weren't being passed quickly enough
added some comments
Minor changes to Whiteboard class.
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/fa13/projects/whiteboard/cath_yun-eruleman-kateyu
added mechanism to pass drawing objects to clients, list of users
Minor changes to Whiteboard class.