Fix Conflicts
Merge branch 'master' of github.com:BdayaNinjas/BdayaAdmin
Added update without submitting yet
Merge branch 'master' of github.com:BdayaNinjas/BdayaAdmin