Merge branch 'master' of https://github.com/hpsin/EECS314
added stuff to load
Merge branch 'master' of https://github.com/hpsin/EECS314