added mockup.mk
added masterfile.ms
Merge branch 'mockup'