Fixed code.
Merge branch 'master' of github.com:tedshd/web-develop