um adding feature bro
whoops got that wrong
Adding correct feature
Add conflicting file
Merge remote-tracking branch 'origin/develop' into feature/bug2

Conflicts:
	conflict.txt
Merge pull request #2 from ColinWragg/feature/bug2

Feature/bug2