getting rid of xmmc folder
working on ups design
Merge branch 'newFSM' of https://github.com/mam1/Pcon into newFSM