Finished all but the custom git command.
Merge pull request #123 from apotheos/master

Finished all but the custom git command.
resolved conflict'