delete feature_x
Merge branch 'feature_x' of https://github.com/geekroad/next into feature_x

Conflicts:
	README