funny commit
funny commit
add js
Merge branch 'gh-pages' of https://github.com/merrick1988/angular-lego into gh-pages