Config class
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into config
Alignment
Merge pull request #8 from dfreerksen/config

Config