ds store issues
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	compsci/.DS_Store
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	compsci/.DS_Store
.DS_Store banished!
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
kevin bungee is back!