Ignoring IDE files
Merge branch 'master' of github.com:unreal4u/pid

Conflicts:
	.gitignore