Update c4science branch from upstream
-------------------------------------

# Get changes and merge
git fetch upstream
git merge --squash upstream/stable

# Fix conflict
vim $(grep -rl '<<<<<<<' --exclude-dir=.git)

# Commit and push
git commit -am "Merge with Stable Week XXX"
git push origin stable


TODO
----

- Tester git rerere