Update setup.csv
Merge branch 'patch-1' of https://github.com/SAReyes/WebEng2014 into
SAReyes-patch-1

Conflicts:
	labs/setup.csv
t push origin masterMerge branch 'SAReyes-patch-1'