new branch
electrical things
more stuff
hackathon changes
added prefs for color and twitter text