AdditionFactory exercise added
Merge branch 'master' of https://github.com/cptnhaddock/bb

Conflicts:
	app/main.js