ahajirnis/FallUML2013 — pull request #24 by ahajirnis (2013-10-16 21:40:00+00:00)
Title: Reverting changes to previous merge

Undoing the changes from merge 8 and 16