Updated za and exam
Merge pull request #25 from zerious/master

Updated za and exam
Updated za
Merge pull request #26 from zerious/master

Updated za
Merge branch 'master' of github.com:lighterio/lighter

Conflicts:
	package.json