...
Merge branch 'master' of https://github.com/lulirez/cripto
lalala
lalala
hgjhg
ilalalaMerge branch 'master' of https://github.com/lulirez/cripto

Conflicts:
	workspace/cripto/src/main.c
lalala