asdada
Merge branch 'master' of https://github.com/vaeum/config

Conflicts:
	README.md