Feature/branching

The whitespace one is done automatically by my editor, I can remove if necessary.