random crap that wasn’t really necessary and button update
Merge remote-tracking branch 'origin/viewControllers' into viewControllers