Update controllers
Merge branch 'master' of github.com:jeffcarp/angularjs-talk
Start defining talking points and code