merge apocalypse is imminent
Merge branch 'master' of https://github.com/lucasjcm/dankjank
hooked up js
Merge branch 'master' of https://github.com/lucasjcm/dankjank