ahajirnis/FallUML2013 — pull request #85 by ahajirnis (2013-11-27 00:29:47+00:00)
Title: Smarts

Resolving master conflicts