update ignores
Merge branch 'master' of https://github.com/frejon/Lapdog_GIT

Conflicts:
	.gitignore