I'm running out of funny things to say
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/uml/scene/sceneObjects/InterfaceNode.java
I'm RUNNING OUT OF ASS..> FUCK!