edit note
Merge remote-tracking branch 'upstream/master'
edit and min
Merge pull request #84 from andreqi/master

edit min and change of color in first page