Edited reading in data to get from database
Merge branch 'master' of https://github.com/MustangTutors/main