Changed to one form of variable declaration (coincidentally the flavor I prefere ). Added variable declarations to undeclared vars
Changed to 1 var pr scope. Changed == to ===
Resolved conficts
Merge pull request #10 from EivindEE/master

I did some code linting on the file