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
Add slides for introduction-to-apis in lectures week-4/day-2
Add notes for introduction-to-apis in lectures week-4/day-2
Add link to APIs scheduledfor week-4/day-2/dawn
Removes erroneously placed .DS_Store file in /lectures
Add line about minions in lectures notes week-4/day-2/dawn
Added bootstrap and tictactoe solution
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Fix broken hyperlink in API lecture week-4/day-2/dawn
Fix order of slides in API lecture week-4/day-2/dawn
Update week-4.md
Update week-4.md
Adds notes for creating api in API lecture week-4/day-2/dawn
Update week-4.md