initial import
done initial coding
Merge branch 'master' of ../spish.dev