Merge pull request #2 from CMPUT301F14T03/master

Merged pull other test suites
test
Got josh's file
"Commit?!"

Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/Comment.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/Question.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/commentTestCases.class
	cmput301t03appTEST-test/bin/classes/commentTest.class
Merging!

Merge remote-tracking branch 'upstream/master'
"Merge 2"
Merge remote-tracking branch 'upstream/master'
Added UML version 3
Merging from master
Merge pull request #71 from iameric1986/master

Add UMLv3