update
Merge branch 'master' of github.com:neosavvy/ng-conf-hack
Merge branch 'master' of github.com:neosavvy/ng-conf-hack
var names
Merge branch 'master' of github.com:neosavvy/ng-conf-hack