Updated git ignore to prevent the jquery knob library being added to the repo (I'm not sure how desireable this is, but it makes sense for the gitignore file to
be consistent with the state of the repo)
Merge remote-tracking branch 'origin/master'
added maths for calculator