first commit
Merge branch 'master' of https://github.com/catherine-jones/phoenix-site

Conflicts:
	.gitignore