[Teddy] changed layout, set up Teddy user
Merge branch 'master' of github.com:duke-compsci408-fall2014/FailSafe