desktop development
fixed index merge
revert to 0397906
removing problem files
Merge branch 'master' of https://github.com/rakalakalili/tastysitev2