First commit
Merge https://github.com/netzsooc/WATT_2013

Needed to upload to github