Feature branches

[h0pbeat]

For the love of god, start using separate branches for different features being added.
Otherwise we will never be able to manage this thing properly, if there are hundreds of changes in a single branch.