Ingore node_modules and bower.
Merge remote-tracking branch 'origin/master'