settings
Merge branch 'master' of https://github.com/aarondunn/aa100
Merge branch 'boss_ginger'
Merge branch 'boss_ginger'
Merge branch 'boss_ginger'
new way