Revert "Delete config.neon"

This reverts commit 96552aeee2df0ac897675887f340b1f0e3ae3b72.
Revert "Delete config.local.neon"

This reverts commit 099ebbc88716b6425c3e8aa6d93a918c265fc569.
Merge origin/master

Conflicts:
	README.md