cd change set 1
Merge branch 'master' of github.com:davincicoders/2014-t1-ruby

Conflicts:
	101-git-practice/views/cd.html.erb
102 html practice
HW 102 exercise 8