Add new directories and update some misc files
Removing merge conflicts
Merge branch 'master' of https://github.com/sf-wdi-14/notes

Conflicts:
	assignments/week-1/dom-exercises/fix-my-dom/dom.js
Adding index and style files to make dom.js work
Add my hack-it files

Conflicts:
	assignments/week-1/dom-exercises/fix-my-dom/dom.js
Merge branch 'master' of https://github.com/sf-wdi-14/notes

Conflicts:
	assignments/week-1/dom-exercises/fix-my-dom/dom.js
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Merge pull request #78 from benjamincrane/master

Add my hack-it assignment