fixed readme, updated karma config
Merge remote-tracking branch 'origin/master'

Conflicts: