aois
Merge branch 'master' of https://github.com/alxcoh/Peioa3yhedniuw4nrxdiwuyahebnquiekjhba2niquyjkehadlm2idjniuy4wkgjdbhniabhn7iguahj2qagny427dy42yfgnyda

Conflicts:
	workspace/.metadata/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Common
Functions/com.python.pydev.analysis/2.v1_projectinfodelta

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Common
Functions/com.python.pydev.analysis/3.v1_projectinfodelta

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Common
Functions/com.python.pydev.analysis/5.v1_projectinfodelta