Merging in sine wave stuff.
Merge branch 'master' of github.com:vselvarajijay/hearts-on-fire