merge --no-ff alabeduarte-removing_bower_components_from_repo