uhhh... that broke stuff so i'm changing it back temporarily
Merge pull request #41 from waneka/mvc

uhhh... that broke stuff so i'm changing it back temporarily