Continued working on testing angular
slkdfjMerge branch 'master' of github.com:panjiw/Team-Player