Move app secrets into a separate file that's not checked into source control.
index.js
Merge branch 'master' of https://github.com/allensch/urbanfruit.ly

Conflicts:
	.idea/workspace.xml
stop tracking node modules
Remove AppSecrets from source control.  Please generate this from template and keep out outside of source control

split a dev and master branch to support git flow branching model
Merge branch 'release/0.0.1'
Merge branch 'master' of https://github.com/dlai0001/urbanfruit.ly