test

test local
Merge branch 'master' of https://github.com/arunreddyc/my-angular-app

Conflicts:
	test/runner.html