Merge branch 'master' of https://github.com/ngorogiannis/cyclist

Conflicts:
	README.CSL-LICS14
Merge branch 'master' of https://github.com/ngorogiannis/cyclist.git