merge github branch with local branch, use dedicated version control

[stanleyjs]

The current uploads are all drag and drop from my hard disk. I need to merge my local branch and make it coherent with the github version