Added user following
Merge branch 'master' of github.com:covingtondoan/sample-app

Conflicts:
	.DS_Store