Merge branch 'master' of https://github.com/TessMyers/amber-storm
resolve irregularity
Merge branch 'master' of https://github.com/TessMyers/amber-storm