new main.html, main.scss, main.controller.js
Merge pull request #2 from lizlongnc/dev_liz

changes to main.html, main.scss, main.controller.js