Starting switch to more OOP (using js's odd way of doing things)
Merge branch 'master' of https://github.com/bawjensen/bawjensen.github.io