front page
actual home page
Merge branch 'master' of github.com:zhangela/desk-trainer

Conflicts:
	.DS_Store