update to karma
Merge branch 'master' of https://github.com/iamkevla/iamkevla.github.com

Conflicts:
	karma-e2e.conf.js
	test_out/e2e.xml