had to commit in order to show something
commit for switchbox
commit for switchbox
commit after git reset HEAD~1 .
Merge branch 'AdAndSearch' of https://github.com/ese-unibe-ch/ese2014-team8 into AdAndSearch