Test controller, changes
Merge branch 'master' of https://github.com/andymitrich/angular_phonecat