adding bower and npm package information.
fixing merge conflict. oops.