Muahaha
Merge branch 'feature/SillyFeature'
Merge branch 'master' of https://github.com/Mattivc/GitFlowTest

Conflicts:
	README.md