+ files
+ ignorance
+ instructions
+ instructions
+ dependencies
+ dependencies
+ grunt
+ dependencies
+ karma
+ karma
+ karma
+ dependencies
+ dependencies
+ module
-
Merge branch 'master' of ssh://github.com/braungoodson/test-driven-development

Conflicts:
	README.md