Installed Mocha
Fixed file names to dash delimited
Merge branch 'bootstrappy'

new bootstrappy layout
Change to module format for functionality