Small fixes to initial data
Added scaffolded controllers
Merge branch 'master' of https://github.com/gpothier/funfork