pubscpec
Merge branch 'master' of https://github.com/frankpepermans/dart_flex

Conflicts:
	pubspec.yaml
merge
Merge branch 'master' of https://github.com/frankpepermans/dart_flex