moved _config.yml into app folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/_config.yml