adding npm
adding angular as a dependency
bumping versions
swapping var assignment
resolving conflict