Platypus to header
Merge branch 'master' of https://github.com/sakarit/platypus

Conflicts:
	public/index.html
platypus to frontpage