add - css html restyling
add - styling, removed commented angular shim scripts
resolve - master conflicts
Merge pull request #11 from anastasia/integration

CSS styling, HTML reorganization