Merge pull request #1 from JahBrewski/master

Knockout seems to be working!
Update site.js
Working on conversion logic and storage of units & conversion factors
Conversion logic/etc