added .gitignore
Merge branch 'master' of https://github.com/bryangm/website

Conflicts:
	.DS_Store