new var equal 5
Merge remote-tracking branch 'origin/amazingFeature' into amazingFeature

Conflicts:
	new_feature.txt