Merge branch 'dev' of https://github.com/msirull/skynet into dev

Conflicts:
.DS_Store
files_in_dev/gitupdate.py
files_in_dev/gitupdate/py.py
files_in_dev/globals.py