fixes in yes
Merge branch 'master' of github.com:BdayaNinjas/BdayaAdmin