Update seed files
Merge branch 'master' into seed

Conflicts:
	client/index.html
Merge pull request #10 from banjeremy/seed

Seed