first commit
updated bower.json
resolve conflict, first push