unminified javascript
minified javascript
minified js
updated
updated files
added assets back in
ds store
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	compsci/.DS_Store