Merge pull request #3 from TIY-Q2-FEE-CHS/master

js shit.
Merge pull request #7 from rphitt1/master

js shit.