added jshintrc
updated bower.json and readme
fix merge conflict