commit
Update test.js
Update README.txt
Update README.txt
commit
Merge branch 'master' of https://github.com/AubergineSolutions/AngularJSUnitTesting
Merge branch 'master' of https://github.com/DarshanaPanchal/test

Conflicts:
	README.txt
	test/test.js
commit