duh
getting into the newest version of dev
button
fixed conflicts
added pre dev merge changes
 merging dev into button changes
Merge branch 'fixedButton' into dev
reverting to old button, new button failed for some reason