first commit from pc
Merge branch 'master' of https://github.com/musadhk/tripodea