jshint paranms and manifest.js included
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/cstipkovic/corsac
Merge pull request #7 from cstipkovic/master

Merges and JSHint parameters added