6-13
6-13-15
Merge branch 'master' of https://github.com/lclouds/cloud-lab

Conflicts:
	log/development.log