First public commit.
Fixing conflicts.

Merge branch 'master' of https://github.com/EduardoMiravalls/ARC

Conflicts:
	README.md