Merge pull request #246 from sunnyLA4/fresh

event modified
index page edited
merge conflict
Merge pull request #248 from KodeKracker/master

merge conflict push
Merge remote-tracking branch 'upstream/master' into fresh