uniform done
Merge branch 'master' of https://github.com/yhan819/cs276
done??