Not using the premade buttons

I'LL MAKE MY OWN BUTTONS DANGIT
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
oops
REDO THAT