Add feature!
Merge branch 'master' of github.com:scjody/github-test into feature

Conflicts:
	README.md
Merge pull request #1 from scjody/feature

Add feature!