Updated ignore file.
Bower dependencies.
Merge remote-tracking branch 'origin/master'