x
Merge branch 'master' of github.com:rgil90/sample_app

Conflicts:
	public/.DS_Store