Create README.md
Rails scaffold
Merge branch 'master' of github.com:andrewhamon/not-a-virus

Conflicts:
	.DS_Store
Testing for dokku