MikkelFennefoss/prism — pull request #4 by wenneberg6 (2013-03-05 13:50:05+00:00)
Title: merged code with maria and dan

Code has been organized( as such ) and should be almost final