gitignore changed
Merge branch 'master' of https://github.com/troylanigan/heidi

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/troylanigan/heidi
sunday session