.
Merge branch 'master' of https://github.com/DAMA-UPC/SCD

Conflicts:
	source/main.cpp
Added lookahead option.
Moved Clock code to a separate file.