Create README.md
Create README.md
Merge remote-tracking branch 'origin/master'
Start new feature - Selecting color
Fragment Controls layout
fragment_color blank
Merge remote-tracking branch 'origin/dev' into
dev/feature/color-selecting
Merge branch 'dev/feature/color-selecting' of
https://github.com/A-App/Music-Strobe.git into
dev/feature/color-selecting

Conflicts:
	Music-Strobe/bin/R.txt
098
- добавила hue, пока работает плохо
098
- добавила hue, пока работает плохо
- диалог fragmentcolor
099
- сделала custom view (чужой пример, ненастроено)
Восстановила версию 100
Merge pull request #2 from A-App/dev/feature/color-selecting

reorganizing branches