Merge pull request #80 from oafridi/refactor

Refactor
Merge pull request #81 from oafridi/refactor

converted html to haml
removed redundant dirs and whitespace