fix after restructuration
Merge branch 'master' of github.com:qkdreyer/codinweek1
update controls
Merge branch 'master' of github.com:qkdreyer/codinweek1