Merge pull request #40 from bradylarson/master

Changed arrays to arrayLists
Added associated_user_id to Enrollment