oh god i hate android
Merge branch 'master' of github.com:ndm25/EECS314
adding load functionality
hopefully my merge was successful!
actually resolving merge conflicts