Update Ignore
Merge branch 'master' of https://github.com/Bill0106/mysites

Conflicts:
	.gitignore