#38: Added in html mockups
#38
#38
#38
Merge pull request #39 from rhsu/htmlmockup

Htmlmockup
Merge branch 'master' into labels