Changes before computer died during class#2

torimachado wants to merge 1 commit intocs109:mastercs109/2015:masterfrom

torimachado:mastertorimachado/2015:masterCopy head branch name to clipboard