Assignment consistency & moving folders
Merge pull request #237 from depstein/smallfixes

Assignment consistency & moving folders
Update url of video prototype
Merge pull request #238 from tchuang/aqueous

Update url of video prototype