Merge branch 'master' of https://github.com/n0mjs710/IPSC

Conflicts:
	.gitignore
fix