commit
commit
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	.DS_Store
	Week 1/index.html
	Week 1/js/main.js
most recent commit
re commit html
re commit
Merge remote-tracking branch 'origin/master' into gh-pages