command line
Merge branch 'master' of https://github.com/chaosforfun/Angular-test-animate.git

* 'master' of https://github.com/chaosforfun/Angular-test-animate.git:
  command line

Conflicts:
	angular-phonecat