Merge branch 'master' of github.com:ntnu-smartmedia/elephant

# By Patrick Romstad
# Via Patrick Romstad
* 'master' of github.com:ntnu-smartmedia/elephant:
  Added prettier print