newnew change
Merge pull request #1 from javalove93/newnew

newnew change
from hotfix branch
Merge pull request #2 from javalove93/hotfix

from hotfix branch
Merge branch 'iss53'

Conflicts:
	index.html