tree 901ce800890ba955077c19c0a36ff8285f877a0f
parent 57f2a08a6d2576a8f96779dc80c9f6565669dc3c
parent 2e9a353d008afb0487c5498f4386eec722a76eef
author Roberto Andrade <roberto.andrade@gmail.com> 1462856973 -0400
committer Roberto Andrade <roberto.andrade@gmail.com> 1462856973 -0400

Merge branch 'master' into forkChanges

# Conflicts:
#	package.json