current functional versoin
Merge branch 'master' of https://github.com/xbobo/FinalProject1
added data_import