controller fixes
fixed merge conflicts and blog layout
Merge pull request #15 from bbatsche/isaac

Merging Isaac's branch.