added information
Merge branch 'master' of github.com:KDXU/comp13