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

merge conflict push