inv and entr edit
Merge branch 'master' of https://github.com/chrislim/theotech-static