Initial commit, with Karma config
Merging changes from Github