changing back to arraylist, sorry
Merge branch 'master' of github.com:ndm25/EECS314