Merge pull request #1 from inspiran/master

Setup basic controllers