basic view
Merge branch 'master' into finish
finish
delete rebundant
Merge pull request #17 from Goldenstone/finish

finish #2