@hvillalo
hvillalo Merge branch 'master' of https://github.com/hvillalo/echogram
bd296a5 Aug 3, 2017
Merge branch 'master' of https://github.com/hvillalo/echogram 
# Conflicts:
#	NEWS
#	NEWS.md
bd296a5