front end done
Merge pull request #3 from billkunghappy/master

front end done