Improve ordering
Merge branch 'master' of github.com:joaomsa/hackathon
Merge branch 'master' of github.com:joaomsa/hackathon
Basic bio