Initial commits
Merge branch 'master' of github.com:linkrjr/test_app

Conflicts:
	config/deploy.rb