Added source for Moores law data from ICSA conference
Merge branch 'master' of https://github.com/Felorati/scalablewebservice

Conflicts:
	Report/setup/bibliography.bib
Fixed error in bibliography
Merge branch 'master' of https://github.com/Felorati/scalablewebservice

Conflicts:
	Report/setup/bibliography.bib