fix mergre
Merge branch 'master' of github.com:sf-wdi-15/notes