Change config to a singleton
Merge branch 'master' of https://github.com/GeoffreyLong/EC_AssignmentOne.git
Minor changes