Added Karma (still not working fully)
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/package.json
Update README.md