commit log metadata so I can pull
Merge branch 'master' of https://github.com/damlaren/cs244b_final_project

Conflicts:
	logcabin/smoketeststorage/server1/log/metadata1
	logcabin/smoketeststorage/server1/log/metadata2
	logcabin/smoketeststorage/server2/log/metadata1
	logcabin/smoketeststorage/server2/log/metadata2
	logcabin/smoketeststorage/server3/log/metadata1
	logcabin/smoketeststorage/server3/log/metadata2
ignoring logcabin/smoketeststorage