Getting there...
Helper functions
Hey there
Hey there2
Added stuff
Fixing merge problems
Fixing conflicts
More fixes
More stuff
Fixes
Merge branch 'thor2'
small bugfix
started clarification questions, pairprogrammingswap