your_name.rb
Nelson
nelson-advice
Merge github.com:Cnwauche/skillcrush-104
Merge branch 'master' of https://github.com/Cnwauche/skillcrush-104 into Cnwauche-master

Conflicts:
	index.html
	style.css
Merge branch 'Cnwauche-master'