master test
Merge pull request #13 from origin/master#master_test
Updating Changelog
Merge from master

Conflicts:
	CHANGELOG.markdown