MVC'in
Navy fixy
Merge pull request #3 from wololodev/master

Fix whole lot of crap