Added battery and main to Makefile
Merge branch 'master' of https://github.com/bstrysko/WCTU

Conflicts:
	server/avr/spi.c
Fixed compiler errors