Merge branch 'master' of ssh://github.com/ryuatnorcal/cs3520_final_project