* translation
Merge branch 'master' of https://github.com/ddanninger/fingertown

Conflicts:
	index.html