update gitignore
Merge branch 'master' of github.com:bstoecker/erlangTestApp

Conflicts:
	.gitignore