First draft for Spring 2015.
≈ß≈çMerge branch 'master' of github.com:kwurst/CS-383