local comit
Fixed merge conflicts
Merge branch 'develop' of https://github.com/mikekucharski/inkd into develop
Merge branch 'develop' of https://github.com/mikekucharski/inkd into develop
Pulling from mike
Converted the homepage to MVC
Changed post variable data to be handled by the controller