Rename Khoa's file to deal with stupid web server.
Merge branch 'master' of github.com:Grinnell-CSC195/hw8-2014S

Yay for concurrent updates!  Thanks AS.