Made a new button file, not completed yet
Fixed some Conflicts

Merge branch 'master' of https://github.com/saivan/deathStarTracker

Conflicts:
	Buttons/buttons.c
	Modules/Buttons/button.h
	localInterface/masterHeader.h