Delete .DS_Store
system update
Merge branch 'sandbox' of https://github.com/tbraune89/Energiezaehler into sandbox

Conflicts:
	.DS_Store
Merge pull request #1 from tbraune89/sandbox

Sandbox