committing so it'll merge
Merge branch 'master' of https://github.com/lucasjcm/dankjank
merging in lucas's front-end code
Merge branch 'master' of https://github.com/lucasjcm/dankjank