added ignore
updating ignore
Merge http://github.com/dynerthebard/website

Conflicts:
	website/access.log