ping pong
Merge branch 'master' of https://github.com/krissolh/Prosjektfag-2014-ABB