WIP
Update gitignore
Merge branch 'master' of https://github.com/percepiedg/algorithms

Conflicts:
	algorithms.cbp
	algorithms.layout