Test01
test01 20130222
test git software
test software 2
Merge branch 'hw2' of sp13-w4118-git.cs.columbia.edu:group18 into hw2

Conflicts:
	kernel/color.c