modified .gitignore
Merge branch 'master' of https://github.com/Neanderthaler/Vertalerbouw2014

Conflicts:
	.gitignore