update gitignore
Merge branch 'master' of github.com:Vandborg/SW505E14-Software

Conflicts:
	.gitignore