minor change
Merge pull request #16 from origin/master#test_pull_before_merge
Updating Changelog
Merge from master

Conflicts:
	CHANGELOG.markdown
Merge branch 'development' of github.com:gorje001/auto_mobile_test into development

Conflicts:
	CHANGELOG.markdown