Merge pull request #51 from permalife/danny

Danny
feedback
merge index.html
Merge branch 'danny'

Conflicts:
	zaplings/templates/zaplings/index.html
profile | share
Merge pull request #53 from permalife/master

to danny