add bower.json
update bower.json
Merge branch 'master' of github.com:phaikawl/StronglyTyped

Conflicts:
	bower.json