Updates, also a conflicting one
Merge branch 'flexi-01' of https://github.com/ExpertAnalytics/fortyTwo into flexi-01

Conflicts:
	README.md