Merge Fixes

Cleaned out all the merge errors
Association Changes

SelfAss and Drawing to mouse on halfAss
Small changes

There is now a selector click type and delete messages tell you what you
are deleting
More Association Types

There are now all, I think, association types and delete messages to
reflect that
Cleaning and Relationship

Some general style cleaning and the change from Association and it's
short forms to Relationship and the short form rel. I'm making this
change as Association is a type of relationship so I wanted a better
general term for our model
Relationship Drawing Updates

Except for the dotted line we now can draw the relationship symbols
New Stuff

Draws dotted lines now for those types even for self relationship and I
made and connected up the seperate Node and Relationship Controllers
Fixed save error and started name, method, attributes showing
Inputting and displaying the attributes and methods

Super rough work on displaying the attributes and methods of a class.
Currently only displays on a single line and the input is super ganky
but it works and resizes the window if needed
Modified right click menu in view

changed from 3 separate popups to a single popup with 3 text fields.
Additionally the fields are populated from the information already
present in the node.  I did not commit \bin\DrawPanel.class or
\.gitignore because I was afraid that would break stuff.
JUnitTest

Completed JUnit tests for the node class and started nodecontroller.
Scrollbar Added

Scrollbar is working for large UML files. :)
New methods and attributes power

It's still super janky but I have it working differntly, will get in
more tonight
Changes to attributes and methods

The editing of methods and attributes should be a lot more stable, still
need some fixes but no crashes
Java Docs Ahoy
JUnit Testing

This should be sufficient JUnit testing for iteration 2. There are some
things that need to be cleaned up a lot, but all of the tests pass!
Java docs
Laying groundwork for undo/redo
Added some explanitory/reminder comments