First add!
Adding comment
Change is good!
This is some feature branch
Adding some more stuffs to feature
Now in the 300 branch
313 updating to future!
Merge branch '300-feature'

Conflicts:
	index.php
Merge https://github.com/chredd/gitta
Adding remote!