rename files so clojure can find them...
Merge branch 'master' of github.com:shunenchen/CSE218-2013-WINTER
merge master