testing stuff
auto adjust and autoplay work
Merge branch 'master' of https://github.com/deannazhu514/15237-AND

Conflicts:
	static/js/faderkit.js
Merge branch 'master' of https://github.com/deannazhu514/15237-AND
final proj version. still jankey af