Add name to blogs list
Add name to blogs list
Edit google shopping
Add Stylesheets Folder
Add CSS Styling
Style Dennis's about me page
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Try fix merge conflicts
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Add Fix My Dom and Traffic Lights Exercise Answers
Fix merge conflicts
Fix dom.js conflict
Fix Traffic Lights dom.js conflict
Add hack-it
Fix google shopping conflict
Merge pull request #55 from nax3t/master

Add styling to Ian's about me page
Prepare TDD lecture some more
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Update test-driven-development.md
Merge branch 'master' of https://github.com/sf-wdi-14/notes

Conflicts:
	assignments/week-1/dom-exercises/fix-my-dom/dom.js