merp
Merge branch 'dev' of github.com:glifchits/goldenapple into dev
for final demo
modal tweaks