Working on my awesome feature.
Making my feature even more awesome.
Bug fix.
Another Bug fix.
Still yet another.
Merge branch 'iteration99' into develop
Working workin.
Merge branch 'awesomeFeature' into develop

Conflicts:
	code.txt