Add first version
Merge branch 'master' of github.com:freegroup2/FlexAndOSMF2

Conflicts:
	.gitignore