got rid of yeoman and angular
commiting merge from remote