mergin in ari's changes and committing my stable changes that aren't in index.js and index.html
merging .pyc's git is so annoyting sorry for spam