fixed battery, timer
removed ignored files
merged