config
Merge branch 'master' of https://github.com/michellepai/Sample_App

Conflicts:
	config.php
hide confih