Add some featuere
Merge branch 'master' into some_feature

Conflicts:
	sample.txt
Merge pull request #2 from jmejia/some_feature

Add some featuere