moved initial state to controller
Merge branch 'add-a-controller'
Merge branch 'master' into gh-pages