resimplifying
Merge branch 'master' of https://github.com/jsanc623/amber-framework