Rails new
Merge branch 'master' of github.com:jdeen/static-contact-forms

Conflicts:
	.gitignore