Fix that silly little indexing bug that broke everything ever
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm